]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 946e2ad e22af66 4ed4789)
Merge branches 'ns9x' and 'machtypes' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 7 Jul 2008 15:26:41 +0000 (16:26 +0100)

Trivial merge
Linux 2.6 source tree