| author | Tero Kristo <t-kristo@ti.com> | |
| Wed, 27 Mar 2013 15:11:38 +0000 (17:11 +0200) | ||
| committer | Tero Kristo <t-kristo@ti.com> | |
| Wed, 27 Mar 2013 15:11:38 +0000 (17:11 +0200) | ||
| commit | 9be130937becb203563d436bc5f6adc8e0ae0c16 | |
| tree | 108fa5f995c4fa7e43ca614d682cb93fa77b3fb9 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 044b13bbaf709e7fe91d612e55099388f6210bf3 | commit | diff |
| parent | b446b69da047dc2548c071487707a75662f38503 | commit | diff |
Merge remote-tracking branch 'rnayak/platform-base-3.8.y' into pm-linux-3.8.y
Conflicts:
arch/arm/boot/dts/omap5-uevm.dts
Signed-off-by: Tero Kristo <t-kristo@ti.com>
Conflicts:
arch/arm/boot/dts/omap5-uevm.dts
Signed-off-by: Tero Kristo <t-kristo@ti.com>