summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 16:31:29 +0100
committerMark Brown <broonie@linaro.org>2014-08-04 16:31:29 +0100
commit62e951ea6516ce7fd1a98da0438dbdbfe25a1567 (patch)
treec0242730958b7d5b945d361fd1f40b58588af9d5 /sound/soc
parenta486f183daf1e6c56c41740d95815b9ee19fcb47 (diff)
parentdfaf535665faa4b5aba4b59633f6b724a467c96e (diff)
parenta046558719770f94d8660f77654ce9cc712ffe54 (diff)
parent63d36f8814e2837fe8658542bc724659b152324d (diff)
downloadlinux-62e951ea6516ce7fd1a98da0438dbdbfe25a1567.tar.bz2
Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/cirrus' and 'asoc/topic/cleanup' into asoc-next