Merge branch 'cleanup' into for-linus

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
This commit is contained in:
Russell King 2012-10-04 23:01:28 +01:00
commit 43a60c1792
6 changed files with 6 additions and 70 deletions