Merge tag 'v3.6-rc4' into asoc-omap

Linux 3.6-rc4

diff --cc arch/arm/mach-omap2/board-igep0020.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/twl-common.c
Simple merge

diff --cc sound/soc/omap/mcbsp.c
Simple merge

diff --cc sound/soc/omap/omap-mcbsp.c
Simple merge