summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-09 15:10:17 +0800
committerMark Brown <broonie@kernel.org>2015-02-09 15:10:17 +0800
commit97edc4164f73ba916ae2bdece14b83f854fb3837 (patch)
tree6c413c80ac1d184757de0176366b7418710a87af /sound
parent3f1cf65757758ae2a3f777a786fd6c0a73273516 (diff)
parent2f1a11e624d0e8f02282204adfc2a1d374d49fb5 (diff)
parentacae254a8e08b9406e62d456000ebd1573af0cb6 (diff)
parent180cf794d4f5e0e82a4df30b8bacd9b472f80f44 (diff)
parent4536a00116f084cf20ec77f3540c481c02ad8d0e (diff)
parent888c819d0feb9975216978c797ca7f8dfd48ed08 (diff)
Merge remote-tracking branches 'asoc/topic/doc', 'asoc/topic/dwc', 'asoc/topic/fsi', 'asoc/topic/fsl' and 'asoc/topic/fsl-asrc' into asoc-next