Merge remote-tracking branch 'sound-current/for-linus'

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

Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)

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

Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/imx/imx-audmux.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 11 Apr 2012 01:15:57 +0000 (11:15 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/imx/imx-audmux.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history