diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-07-07 15:04:40 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-07 15:04:40 +0100 |
| commit | f2a763858a7d0236d658116918c7b1e2c7a5e0cf (patch) | |
| tree | cf86a7b3b2c9f5710506dfb940567f1750869c18 /include/linux/timerqueue.h | |
| parent | ASoC: rt5645: move RT5645 muxes to rt5645_specific_dapm_widgets (diff) | |
| parent | ASoC: Remove snd_soc_codec dapm field (diff) | |
Merge branch 'topic/codec-dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5645
Conflicts:
sound/soc/codecs/rt5645.c
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions