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

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

Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)

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

Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)
diff --cc arch/arm/mach-omap2/devices.c
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge
diff --cc arch/arm/plat-omap/devices.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 23 Sep 2011 02:49:30 +0000 (12:49 +1000)
		1	2
arch/arm/mach-omap2/devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-omap/devices.c	patch \|	diff1 \|	diff2 \|	blob \| history