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

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

Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)

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

Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/configs/mpc85xx_defconfig
Simple merge
diff --cc arch/powerpc/configs/mpc85xx_smp_defconfig
Simple merge
diff --cc sound/soc/fsl/mpc8610_hpcd.c
Simple merge
diff --cc sound/soc/fsl/p1022_ds.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 4 Apr 2012 01:29:17 +0000 (11:29 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/mpc85xx_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/mpc85xx_smp_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/mpc8610_hpcd.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/fsl/p1022_ds.c	patch \|	diff1 \|	diff2 \|	blob \| history