diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-14 11:33:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-14 11:33:07 -0700 |
| commit | f41509ad0d4c11d0911630440749d409ce2aa1aa (patch) | |
| tree | cacd9b3637d905af7618262cec4d9113e147a5f4 /net/mac80211 | |
| parent | 61e6cfa80de5760bbe406f4e815b7739205754d2 (diff) | |
| parent | c49f4984fd45be36502e903e7a5a6a4faff42931 (diff) | |
| parent | 8d71528343c69ce387bd5fdb4fd8dc2b9f69d97c (diff) | |
| download | blackbird-obmc-linux-f41509ad0d4c11d0911630440749d409ce2aa1aa.tar.gz blackbird-obmc-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.
