Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Nov 2009 23:37:21 +0000 (23:37 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 10 Nov 2009 23:37:21 +0000 (23:37 +0000)

Trivial merge