summaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 15:53:32 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 15:53:32 +0000
commita5de5b74a50113564a1e0850e2da96c37c35e55d (patch)
tree518def9fdc525e1a8331edcea06e8630b3e9910f /include/sound
parentfb4587da5b1da8415a716193522c395280b4049b (diff)
parent0d895e14dff0af1838ca79a82f2c0cee7b8bf7ef (diff)
parent50d12367811a26dd8d5f7090d5578c3edecb795d (diff)
parent44b1c9a6e7a2692e761e35ada2ffe84b20c2a377 (diff)
Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next