| author | Archit Taneja <archit@ti.com> | |
| Thu, 28 Mar 2013 05:45:08 +0000 (11:15 +0530) | ||
| committer | Archit Taneja <archit@ti.com> | |
| Thu, 28 Mar 2013 05:45:08 +0000 (11:15 +0530) | ||
| commit | 547027c5e5bc20607716dfe7ec6e42cfa4b18cd9 | |
| tree | a5c6043f835d7e0fe6044f702d725247eedd1ece | tree | snapshot (tar.xz tar.gz zip) |
| parent | 04c34f3eef2ef86956a14d8699f0dee68e98f83c | commit | diff |
| parent | bd54333f61e8ba2dd37d99812153a03af109a862 | commit | diff |
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
Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/mach-omap2/cclock54xx_data.c