diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-05 02:07:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-05 02:07:23 +0100 |
commit | 256fca9247c4e62408923a0fe861398510cf6bc1 (patch) | |
tree | 133431f188c694f0d0bf88d4277924d0d39c5fbf /include/sound/soc.h | |
parent | Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/davinci', 'aso... (diff) | |
parent | ASoC: Remove snd_soc_jack_new() (diff) | |
parent | ASoC: max98357a: Use standard DAI names (diff) | |
parent | ASoC: omap-pcm: Allow only formats with 1, 2, and 4 byte physical size (diff) | |
parent | ASoC: rt286: add jack detection disable with NULL jack passed (diff) | |
download | linux-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