summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:10:14 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:10:14 +0800
commit3f1cf65757758ae2a3f777a786fd6c0a73273516 (patch)
tree7758ba4ec5448f4dfe55f8ad42bd80843c7fab02 /sound
parentbd862e12bf677b9f8f5058a131548fdb7746e6a2 (diff)
parentcd2ee8ad55a1728f291a760cece9ceac11462b9e (diff)
parentddaca25aa4dade234163290f6a9e091e7f57b36a (diff)
parentcaa1d794cca96c16e4a2f81697f3d15a588c4b02 (diff)
Merge remote-tracking branches 'asoc/topic/cs42l73', 'asoc/topic/dai' and 'asoc/topic/davinci' into asoc-next