Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

author Mark Brown <[email protected]>

Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)

committer Mark Brown <[email protected]>

Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
author Mark Brown <[email protected]>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
committer Mark Brown <[email protected]>
Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
diff --cc Documentation/devicetree/bindings/sound/fsl-sai.txt
Simple merge
diff --cc sound/soc/fsl/fsl_sai.c
Simple merge
diff --cc sound/soc/fsl/fsl_sai.h
Simple merge
author	Mark Brown <[email protected]>
	Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
committer	Mark Brown <[email protected]>
	Mon, 1 Sep 2014 15:36:34 +0000 (16:36 +0100)
		1	2
Documentation/devicetree/bindings/sound/fsl-sai.txt	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/fsl_sai.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/fsl_sai.h	patch \|	diff1 \|	diff2 \|	blob \| history