Merge tag 'v3.6-rc4' into asoc-omap
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 05:04:34 +0000 (13:04 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 05:04:34 +0000 (13:04 +0800)
Linux 3.6-rc4

1  2 
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/twl-common.c
sound/soc/omap/mcbsp.c
sound/soc/omap/omap-mcbsp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge