author | Tero Kristo <t-kristo@ti.com> | |
Mon, 27 May 2013 14:06:42 +0000 (17:06 +0300) | ||
committer | Tero Kristo <t-kristo@ti.com> | |
Mon, 27 May 2013 14:06:42 +0000 (17:06 +0300) | ||
commit | 5cdf935dbd11bac3d895b1fb8482795e397c8894 | |
tree | 7c7f70d8706a9ca160bd5f24190db26b4f548b8c | tree | snapshot (tar.xz tar.gz zip) |
parent | 36a2b8d10ee4f46f54afdb2e04e3ef8cf463ad52 | commit | diff |
parent | a859e4a9b7e7354476e7546fb2b78d1aaa19d3f6 | commit | diff |
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>
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: