summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-16 19:06:53 +0000
committerMark Brown <broonie@kernel.org>2017-02-16 19:06:53 +0000
commit51d0a223278a7f0c63472fa1353ab73eb77a5bf0 (patch)
tree98f39a6bf4e097618703cd21996dc4f5f54d61f5 /sound
parent466de26a69ee03554a37333bbf69a87c1de6c3cf (diff)
parentc9b0bdc74735a5173cdce67f8a85f85c2e8bccee (diff)
parentaf4b654f9fa87cf66a06f4841074b6738ed58606 (diff)
parent66ead502af7de65d1e555189cdca8f47eddac400 (diff)
Merge remote-tracking branches 'asoc/topic/wm8741', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next