]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 695a9d2 faed568)
Merge Zaurus branch
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 20 Jun 2006 18:49:07 +0000 (19:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 20 Jun 2006 18:49:07 +0000 (19:49 +0100)

Trivial merge
Linux 2.6 source tree