Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Jul 2011 08:54:29 +0000 (09:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 8 Jul 2011 08:54:29 +0000 (09:54 +0100)

Trivial merge