Merge branches 'for-3.6' and 'for-3.7' into asoc-next

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)
diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 9 Aug 2012 13:11:17 +0000 (14:11 +0100)