diff options
author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:32 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:53:32 +0000 |
commit | a5de5b74a50113564a1e0850e2da96c37c35e55d (patch) | |
tree | 518def9fdc525e1a8331edcea06e8630b3e9910f /sound/soc/pxa | |
parent | fb4587da5b1da8415a716193522c395280b4049b (diff) | |
parent | 0d895e14dff0af1838ca79a82f2c0cee7b8bf7ef (diff) | |
parent | 50d12367811a26dd8d5f7090d5578c3edecb795d (diff) | |
parent | 44b1c9a6e7a2692e761e35ada2ffe84b20c2a377 (diff) | |
download | linux-a5de5b74a50113564a1e0850e2da96c37c35e55d.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc/topic/zte' into asoc-next