Merge remote-tracking branch 'asoc/topic/max98371' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:29 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:29 +0000 (13:45 +0100)
commit94eaec458c037a8ec3a7cd39118d0d4378cabf11
treef79c26a13f53729153aeb6504442ce49251b065f
parentdb1f3283edcff33719592f3b374f40cf6e8256f4
parentaf37d21a3245c4a54d608c1d85588203ebfe1ef9
Merge remote-tracking branch 'asoc/topic/max98371' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile