Merge branch 'omap-for-v3.15/fixes-v2'
authorTony Lindgren <tony@atomide.com>
Fri, 25 Apr 2014 01:52:53 +0000 (18:52 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 25 Apr 2014 01:52:53 +0000 (18:52 -0700)
Conflicts:
arch/arm/boot/dts/omap3-beagle-xm-ab.dts


Trivial merge