Merge branch 'asoc-4.19' into asoc-next

author Mark Brown <[email protected]>

Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)

committer Mark Brown <[email protected]>

Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)
author Mark Brown <[email protected]>
Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)
committer Mark Brown <[email protected]>
Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)
diff --cc Documentation/devicetree/bindings/sound/qcom,apq8096.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/clk/clk.c
Simple merge
author	Mark Brown <[email protected]>
	Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)
committer	Mark Brown <[email protected]>
	Thu, 9 Aug 2018 13:47:05 +0000 (14:47 +0100)
		1	2
Documentation/devicetree/bindings/sound/qcom,apq8096.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/clk/clk.c	patch \|	diff1 \|	diff2 \|	blob \| history