Merge remote-tracking branches 'asoc/topic/sta529', 'asoc/topic/sti', 'asoc/topic...

author Mark Brown <[email protected]>

Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)

committer Mark Brown <[email protected]>

Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)
author Mark Brown <[email protected]>
Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)
committer Mark Brown <[email protected]>
Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)
diff --cc sound/soc/Kconfig
Simple merge
diff --cc sound/soc/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)
committer	Mark Brown <[email protected]>
	Sun, 30 Apr 2017 13:16:31 +0000 (22:16 +0900)
		1	2	3	4	5	6
sound/soc/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history