Merge tag 'v3.6-rc6' into devel-dt

Linux 3.6-rc6

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

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

diff --cc arch/arm/mach-omap2/omap-wakeupgen.c
Simple merge

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

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

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

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

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/usb/gadget/u_serial.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge