Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Sep 2009 12:47:57 +0000 (13:47 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 19 Sep 2009 12:47:57 +0000 (13:47 +0100)

Trivial merge