Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Feb 2010 23:35:24 +0000 (23:35 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Feb 2010 23:35:24 +0000 (23:35 +0000)

Trivial merge