Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of https://github.com/nmenon/linux...
authorTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 02:28:41 +0000 (19:28 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 10 Sep 2014 02:28:41 +0000 (19:28 -0700)
1  2 
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap5.dtsi

Simple merge
Simple merge