Merge remote-tracking branch 'rnayak/platform-base-vayu-3.8.y' into vayu-pm-linux...
authorTero Kristo <t-kristo@ti.com>
Mon, 27 May 2013 14:06:42 +0000 (17:06 +0300)
committerTero Kristo <t-kristo@ti.com>
Mon, 27 May 2013 14:06:42 +0000 (17:06 +0300)
commit5cdf935dbd11bac3d895b1fb8482795e397c8894
tree7c7f70d8706a9ca160bd5f24190db26b4f548b8c
parent36a2b8d10ee4f46f54afdb2e04e3ef8cf463ad52
parenta859e4a9b7e7354476e7546fb2b78d1aaa19d3f6
Merge remote-tracking branch 'rnayak/platform-base-vayu-3.8.y' into vayu-pm-linux-3.8.y

Conflicts:
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/pm_omap4plus.c

Signed-off-by: Tero Kristo <t-kristo@ti.com>
20 files changed:
arch/arm/configs/omap2plus_defconfig
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/cclock33xx_data.c
arch/arm/mach-omap2/clock.h
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/common.h
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/pm_omap4plus.c
arch/arm/mach-omap2/powerdomain.c
arch/arm/mach-omap2/powerdomain.h
arch/arm/mach-omap2/sram.c
arch/arm/mach-omap2/sram.h
arch/arm/mach-omap2/timer.c
arch/arm/plat-omap/Kconfig