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)
1  2 
arch/arm/boot/dts/omap5-sevm.dts
arch/arm/boot/dts/omap5.dtsi

Simple merge
Simple merge