diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-14 20:33:07 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-14 20:33:07 +0200 |
| commit | f41509ad0d4c11d0911630440749d409ce2aa1aa (patch) | |
| tree | cacd9b3637d905af7618262cec4d9113e147a5f4 /arch/arm/mach-omap2/board-generic.c | |
| parent | Linux 3.12-rc5 (diff) | |
| parent | Merge tag 'for_3.13/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies (diff) | |
| download | linux-f41509ad0d4c11d0911630440749d409ce2aa1aa.tar.xz linux-f41509ad0d4c11d0911630440749d409ce2aa1aa.zip | |
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.