summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:48:56 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:48:56 +0100
commit41caf0564ea1a8a3b3cb572abc64d5116c150b6c (patch)
tree3aa60e41bf36aaa9bf5891ad99f3722f1ad0987c /sound
parent6ca4aba43e52b0743c28a9fa7d550b96df63b4f0 (diff)
parent32556394501a27c02e7185c4d11a51b636b02f4b (diff)
parentb213b44a96ed1f868f68b094dbcf8fc9622984ef (diff)
Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into asoc-next