Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:52 +0000 (13:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 27 May 2016 12:45:52 +0000 (13:45 +0100)
commit5d8cf7688ede7128ebdad8741ed5bdea0f2cd637
tree19ee8dc86b12d9c8c3f2b237ce9a62bcded37b2b
parent631476d7fd93cc1cde1fc9ea6b3875f8eca79871
parent54aba08f13fab00f31938993c9f7a9b0cd54f666
Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile