summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-27 19:05:01 +0000
committerMark Brown <broonie@kernel.org>2014-11-27 19:05:01 +0000
commit62cbe425485957624f889d0dc76a698c31b61773 (patch)
tree2e4a9663747806e2dc14456f88381b4b0eaee34b /sound
parent9d516dea51e19f41f78935f38bc5c7ba1b020ca4 (diff)
parent2880fc877971d6c14b0c76ac09744e3ff5b126d5 (diff)
parent3ec8d2036464d961a6314281ae68d80a5c071d07 (diff)
parentc4ee42a050e82855aa06d7217937b1549c95bef3 (diff)
parente03b975506545d21b1daa5c8310b59d66e74919c (diff)
parente8125f04421f7757df0017a59cd9b756148ee769 (diff)
Merge remote-tracking branches 'asoc/topic/ts3a227e', 'asoc/topic/twl4030', 'asoc/topic/twl6040', 'asoc/topic/uda134x' and 'asoc/topic/uda1380' into asoc-next