Merge remote-tracking branch 'tero/pm-linux-3.8.y' into av-3.8.y

Conflicts:
	arch/arm/boot/dts/Makefile
	arch/arm/boot/dts/omap5-sevm.dts
	arch/arm/mach-omap2/cclock54xx_data.c

diff --cc arch/arm/boot/dts/omap5-sevm.dts
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

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

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

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

diff --cc drivers/base/dd.c
Simple merge

diff --cc sound/soc/codecs/arizona.c
Simple merge

diff --cc sound/soc/codecs/wm2200.c
Simple merge