summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-07-17 21:45:44 +0100
committerMark Brown <broonie@linaro.org>2014-07-17 21:45:44 +0100
commita3e048a5bbe98acb8830745f172b2af051410fb8 (patch)
treeda843c13022fc716e38d342da87a8bbfbe1917cc /sound/soc/fsl
parent1165d956444a8fdeb07bbbee5e0a5a1a577eb742 (diff)
parent4800f88b615f194ae3c1577038a7ccd871c907c9 (diff)
parentc761b58306b26ea78fa91488cbb04c61b35d583d (diff)
parent4adeb0ccf86a5af1825bbfe290dee9e60a5ab870 (diff)
parent001eaa25ca8cf4bfdb76fa8f2287b8d34287b9b6 (diff)
Merge remote-tracking branches 'asoc/fix/fsl-sai', 'asoc/fix/intel', 'asoc/fix/max98090' and 'asoc/fix/s6000' into asoc-linus