Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:55:03 +0000 (12:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 5 Jan 2012 12:55:03 +0000 (12:55 +0000)
commit4c5f830c4c9d4f19c1eef356c0cd322b46d695c9
treea14ad6c652736bb28859a7aec392a01b236ae58d
parentcc511b8d84d88ab788cddbfe8d21485b1c387493
parent2e3d256de9d3db5a7ca19b61305627a516b54b45
Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD

Conflicts:
arch/arm/plat-omap/include/plat/common.h
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/smartreflex.c
arch/arm/mach-s3c64xx/s3c6400.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/plat-omap/include/plat/common.h