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)
commit6e5542604ab64d9a7866226bbab3725532caf070
tree223271abe58c4bff4e096aa5fe9ca1271ecb679b
parent83c9b2afe66abf5dc6dab68da738557001fb5660
parent66b0436977e2c62388d48836ff784f1fedb49c4f
Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/dt
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap5.dtsi