diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 11:26:27 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 11:26:27 -0400 |
| commit | ddfb43f3881edb47aa0083651ad31983cdc42c33 (patch) | |
| tree | 7128cb13b599d2903a4deb05bbae37508b1c261e /include/sound | |
| parent | ASoC: twl4030: Support for DT booted kernel (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-dev-ddfb43f3881edb47aa0083651ad31983cdc42c33.tar.xz linux-dev-ddfb43f3881edb47aa0083651ad31983cdc42c33.zip | |
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
Diffstat (limited to 'include/sound')
0 files changed, 0 insertions, 0 deletions