Merge remote-tracking branch 'sound-asoc/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/sh/boards/Kconfig
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/twl6040.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 02:07:02 +0000 (12:07 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sh/boards/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/twl6040.c	patch \|	diff1 \|	diff2 \|	blob \| history