Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 15 Dec 2008 10:36:25 +0000 (10:36 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Dec 2008 10:36:25 +0000 (10:36 +0000)

Trivial merge