Merge commit '2ed93f46' into tmp
authorJon Hunter <jon-hunter@ti.com>
Fri, 12 Apr 2013 20:44:38 +0000 (15:44 -0500)
committerJon Hunter <jon-hunter@ti.com>
Fri, 12 Apr 2013 20:44:38 +0000 (15:44 -0500)
commit99d03822465c44bf45fe26aaab40f565e27e60a6
tree5ae0b2dc587f81f397f0593fe4169e4721ec1fb6
parentd2c63ff9e0ca277a6da44ff475365dadca215c1a
parent2ed93f466c0ef3223a81ac97a5719c6766628862
Merge commit '2ed93f46' into tmp
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5.dtsi