summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:10:19 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:10:19 +0800
commit6e685ea6aaa3c578596ff8dbe6efde9485fc68f9 (patch)
tree391f1a7c0186f17d0ee2209073e910899f96fd76 /sound
parent97edc4164f73ba916ae2bdece14b83f854fb3837 (diff)
parent7c27ba46792d3596a83f28243e235a92cba80d45 (diff)
parent7a3a907022439524704caecb717639aea2f1ef9c (diff)
parent812e85bb224a088678eb315307d367d91d0b94e2 (diff)
parentf2610571fd82417f44825f3b705fd651e3788ceb (diff)
parent3efa130de40e7b2d7c7095683af9571bfef1d3a4 (diff)
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'asoc/topic/intel', 'asoc/topic/jz4740' and 'asoc/topic/max98357a' into asoc-next