summaryrefslogtreecommitdiff
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:49:02 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:49:02 +0100
commit9568eaec6c16f909e806a3920699376ec147d8fa (patch)
tree4fd3de9dc7813e96c6905b04ddfa0d0db443b516 /sound/soc/rockchip
parent57b027f697c9d7c0356a53fb9e11e9f8d601fb5c (diff)
parent99632d1077853c2030bec3530011b9d9f423cc89 (diff)
parent3b40a80216e941c518426f7b86705e52acbd413f (diff)
parenta493b6a637e9d8e828d7ed4be4bdf24dfd1f9250 (diff)
parenta577483b6906b3d7aba9cc07e383682fc9b65318 (diff)
Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc/topic/rsnd' and 'asoc/topic/rt286' into asoc-next