Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology'...
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:25 +0000 (15:53 +0000)
commitdc42c6cb309e09fb81c235350b3a7e7976caf52f
treee71f913806b01f70a60921f3bfb6392038d039a1
parentda644e2edea7e3b03f4a9df15d9125902b52c804
parent4e2cc814eb2755df286ea890078fb636e1aa0f69
parentdd5abb742071a962be4403f171063ed1e9d4202d
parent222e728ca29b5976accd1fc520a716d168ee2ca5
parent4090d63b49d7d440ff984db3715d5c780209e8e8
parentf196e9ac07ed1212ce7d106c07a25019c9c1ee18
Merge remote-tracking branches 'asoc/topic/tlv320aic31xx', 'asoc/topic/topology', 'asoc/topic/uda1380', 'asoc/topic/wm2200' and 'asoc/topic/wm8523' into asoc-next
include/sound/soc-dai.h
include/sound/soc.h
include/uapi/sound/asoc.h
sound/soc/codecs/Kconfig
sound/soc/soc-core.c