summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-05 02:07:23 +0100
committerMark Brown <broonie@kernel.org>2015-03-05 02:07:23 +0100
commit256fca9247c4e62408923a0fe861398510cf6bc1 (patch)
tree133431f188c694f0d0bf88d4277924d0d39c5fbf /include/sound/soc.h
parentMerge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'aso... (diff)
parentASoC: Remove snd_soc_jack_new() (diff)
parentASoC: max98357a: Use standard DAI names (diff)
parentASoC: omap-pcm: Allow only formats with 1, 2, and 4 byte physical size (diff)
parentASoC: rt286: add jack detection disable with NULL jack passed (diff)
downloadlinux-256fca9247c4e62408923a0fe861398510cf6bc1.tar.xz
linux-256fca9247c4e62408923a0fe861398510cf6bc1.zip
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/max98357a', 'asoc/topic/omap' and 'asoc/topic/rt286' into asoc-next