]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e74c89 30ff720)
Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 18 Jan 2006 22:56:29 +0000 (22:56 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 18 Jan 2006 22:56:29 +0000 (22:56 +0000)

Trivial merge
Linux 2.6 source tree