Merge branch 'omap-for-v3.15/dt-overo' into omap-for-v3.15/tmp-merge
authorTony Lindgren <tony@atomide.com>
Wed, 12 Mar 2014 17:55:32 +0000 (10:55 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Mar 2014 17:55:32 +0000 (10:55 -0700)
Conflicts:
arch/arm/boot/dts/omap3-overo.dtsi


Trivial merge