Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 26 Jul 2008 22:04:59 +0000 (23:04 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 26 Jul 2008 22:04:59 +0000 (23:04 +0100)

Trivial merge