Merge branch 'topic/ctl-pid-lock' into for-next

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge

diff --cc drivers/mfd/twl4030-core.c
Simple merge

diff --cc sound/soc/s3c24xx/s3c24xx-pcm.c
Simple merge