Merge branch 'for_rmk_17' of git://git.mnementh.co.uk/linux-2.6-im
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 18 Aug 2008 21:17:37 +0000 (22:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Aug 2008 21:17:37 +0000 (22:17 +0100)

Trivial merge