Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dwc' into asoc...

author Mark Brown <broonie@kernel.org>

Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)
diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 13 May 2016 13:26:46 +0000 (14:26 +0100)