diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 19:19:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-04-05 19:19:32 +0100 |
| commit | 53a61d967a480307db4c8f7950ddb8bb1a0fda9b (patch) | |
| tree | 6b3ce07b14db2986a175f30e6477ed40445c7c17 /scripts/patch-kernel | |
| parent | ASoC: Implement interrupt based WM8994 microphone detection (diff) | |
| parent | ALSA: ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
Conflicts due to context changes next to the backported DMA data change:
include/sound/soc.h
Diffstat (limited to 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions