Merge remote-tracking branch 'asoc/topic/log' into asoc-next

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

Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)

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

Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
diff --cc sound/soc/soc-core.c
Simple merge
diff --cc sound/soc/soc-jack.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 9 Dec 2012 15:22:14 +0000 (00:22 +0900)
		1	2
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-jack.c	patch \|	diff1 \|	diff2 \|	blob \| history