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, 16 Sep 2011 20:45:16 +0000 (21:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Sep 2011 20:45:16 +0000 (21:45 +0100)
Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c


Trivial merge