| commit | ddfb43f3881edb47aa0083651ad31983cdc42c33 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sat Sep 22 11:26:27 2012 -0400 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Sat Sep 22 11:26:27 2012 -0400 |
| tree | 7128cb13b599d2903a4deb05bbae37508b1c261e | |
| parent | 2d6d649a2e0fa0268c0d03d5b1d330ca7907d33c [diff] | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 [diff] |
Merge tag 'v3.6-rc6' into for-3.7 Linux 3.6-rc6 has all our bug fixes. Conflicts (trivial overlap): sound/soc/omap/am3517evm.c