| author | Archit Taneja <archit@ti.com> | |
| Thu, 25 Apr 2013 03:30:45 +0000 (09:00 +0530) | ||
| committer | Archit Taneja <archit@ti.com> | |
| Thu, 25 Apr 2013 04:13:26 +0000 (09:43 +0530) | ||
| commit | 2a4c34c11a98cee14b9ca771aac4a1b712a7b695 | |
| tree | d5b17c2ef4477e8f4e83ca9827a6debb7eb2ad43 | tree | snapshot (tar.xz tar.gz zip) |
| parent | b09f88c2d2c6aa6847e5c9d6efe0a700a08f9f85 | commit | diff |
| parent | 96e1ede1176edef7a7f6b80278c82d31642e4169 | commit | diff |
Merge remote-tracking branch 'rajendra/platform-base-3.8.y' into av-3.8.y
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Conflicts:
arch/arm/boot/dts/omap4-panda.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/mach-omap2/omap-mpuss-lowpower.c
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
12 files changed: