diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 01:17:30 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-08 01:17:30 +0000 |
| commit | 4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb (patch) | |
| tree | 8dd15df476c14b4ab85d5beca775af561c2ea23d /kernel/workqueue.c | |
| parent | ASoC: Disable thermal shutdown when not using speakers in wm_hubs (diff) | |
| parent | ASoC: Ensure we get an impedence reported for WM8958 jack detect (diff) | |
Merge branch 'for-3.2' into for-3.3
Conflicts:
sound/soc/codecs/wm8940.c
Diffstat (limited to 'kernel/workqueue.c')
0 files changed, 0 insertions, 0 deletions