summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-07-03 16:15:15 +0100
committerMark Brown <broonie@kernel.org>2017-07-03 16:15:15 +0100
commit858e84a1abb24be357a278d99d60b175b4bf6b0b (patch)
treee33b6a76c6a5852355e2259af0d6cea4f6d479e3 /sound
parentf459768c6cd4c1057fe783810ef0335807eb48a7 (diff)
parent69beca69d68b69b38c2610b8b5fd2e27a40d441b (diff)
parent73d7ee2e831f106ca5c745b2cf4fdbac5a4e9e4e (diff)
parent33c0f552c9f3721b1e9452b1c82a37992fa90bfd (diff)
parent6d3edf866ffa7a9348cfc30d9f58270e4f8d068e (diff)
Merge remote-tracking branches 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rockchip' and 'asoc/topic/rt5514' into asoc-next