Merge branch 'cleanup' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c


Trivial merge