Merge branch '3.1-fixes-for-rmk' of git://linux-arm.org/linux-2.6-wd into fixes
Russell King [Sat, 13 Aug 2011 08:43:19 +0000 (09:43 +0100)]

Trivial merge