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

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

Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)

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

Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)
diff --cc arch/arm/mach-omap2/mcbsp.c
Simple merge
diff --cc arch/arm/mach-pxa/eseries.c
Simple merge
diff --cc arch/arm/mach-pxa/stargate2.c
Simple merge
diff --cc arch/arm/mach-pxa/tosa.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:29:03 +0000 (13:29 +1100)
		1	2
arch/arm/mach-omap2/mcbsp.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/eseries.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/stargate2.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/tosa.c	patch \|	diff1 \|	diff2 \|	blob \| history