Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13...
authorTony Lindgren <tony@atomide.com>
Mon, 14 Oct 2013 18:33:07 +0000 (11:33 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Oct 2013 18:33:07 +0000 (11:33 -0700)
We need the fixes in v3.12-rc5, dts changes in omap-for-v3.13/dt, and
the platform data quirk changes in omap-for-v3.13/quirk to start
removing omap3 board files without breaking things.


Trivial merge