summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-25 17:57:49 +0000
committerMark Brown <broonie@kernel.org>2015-11-25 17:57:49 +0000
commit787b121db159641de9d0bfd11dc8c3f0ff8697d3 (patch)
treeaca111c411b94f076580749511b03ef75f2bec7d /sound
parent665ddeb210c10f4daf8ffbe07072771c0020af3a (diff)
parent0ad7d3a04b2a1a43fa71eb89f754527b082213ad (diff)
parent113b0b20fc123bc522ded68ea710d789b0415ebe (diff)
parentab07eaedb7ada83cc6341894dff9cd54f1af7f8b (diff)
parent3cc7780b6fc04318ab08d84f739503989200cf55 (diff)
parent87b5ed8ecb9fe05a696e1c0b53c7a49ea66432c1 (diff)
Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/es8328', 'asoc/fix/fsl', 'asoc/fix/fsl-sai' and 'asoc/fix/intel' into asoc-linus