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)
commitf41509ad0d4c11d0911630440749d409ce2aa1aa
treecacd9b3637d905af7618262cec4d9113e147a5f4
parent61e6cfa80de5760bbe406f4e815b7739205754d2
parentc49f4984fd45be36502e903e7a5a6a4faff42931
parent8d71528343c69ce387bd5fdb4fd8dc2b9f69d97c
Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal

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.
arch/arm/boot/dts/omap3-beagle-xm.dts
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/mach-omap2/board-generic.c