summaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000/s6000-i2s.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 13:49:09 +0200
committerMark Brown <broonie@kernel.org>2014-10-06 13:49:09 +0200
commita5448c88b812390a3622e76d774e10c0da1fb970 (patch)
tree40f87e20d02f7c34f9cad5399c220cb81af20af0 /sound/soc/s6000/s6000-i2s.c
parentMerge remote-tracking branches 'asoc/topic/suspend', 'asoc/topic/tas2552', 'a... (diff)
parentASoC: txx9: Don't opencode DMAengine API calls (diff)
parentASoC: Allow SND_SOC_WM8978 to be selected manually (diff)
parentASoC: wm8994: Demux the microphone detection IRQ (diff)
downloadlinux-a5448c88b812390a3622e76d774e10c0da1fb970.tar.xz
linux-a5448c88b812390a3622e76d774e10c0da1fb970.zip
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next