diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-29 00:51:05 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-29 00:51:05 +0800 |
| commit | 06dc374c70fd75fb3f81a4c1f6586d7c5b8e3833 (patch) | |
| tree | c14018309adcae62979c2f73c4197a16280a923e /include/linux/timerqueue.h | |
| parent | ASoC: wm_adsp: Accept 0 as a parameter block address (diff) | |
| parent | ASoC: wm_adsp: Ensure ADSP2 DMAs are quiesced when DSP is halted (diff) | |
Merge remote-tracking branch 'asoc/fix/adsp' into asoc-adsp
Conflicts:
sound/soc/codecs/wm_adsp.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions