Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:23 +0000 (16:15 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:15:23 +0000 (16:15 +0100)
commit478b77461a88304ad1566c042d6aa141815ba19f
treef6e0ff2d0e5d6ec6ac8b0d7dc4f503ef0ced2d8a
parentf116d2ffb9ed4ccce169aacb46a421fb802245c6
parent0e15bdfd8b1e3a94862522580161a2d1bb3882a7
Merge remote-tracking branch 'asoc/topic/zx-aud96p22' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile