Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 15 Aug 2009 15:51:48 +0000 (16:51 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Aug 2009 15:51:48 +0000 (16:51 +0100)

Trivial merge