]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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