Merge remote-tracking branches 'asoc/topic/cs42xx8', 'asoc/topic/davinci', 'asoc...

author Mark Brown <broonie@kernel.org>

Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)
diff --cc Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 10 Feb 2016 19:23:19 +0000 (19:23 +0000)