summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:11:58 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:11:58 +0000
commita6a21e6bca4f8cc349ebea5d96ccbb8fca8b6686 (patch)
tree90d89e539f4c873501a9ac4b1da7d25c205cae37 /sound/soc
parentfed25395ff76cf44302ed8f741cc1a86a554aef5 (diff)
parent077661b6ed24e530dabc9db3ab3ae48fbaf19679 (diff)
parentcb3fc1ff46667ee4ab23ef22c9e391aa7d014cdf (diff)
parent6a6dec83e5abbc5003dac234970b51afa142defd (diff)
parent4c9a8845f95e852a21fe6cffbd7912107d71619c (diff)
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-card', 'asoc/topic/fsl-dt' and 'asoc/topic/fsl-ssi' into asoc-next