Merge tag 'v3.6-rc6' into devel-dt
authorTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 18:42:13 +0000 (11:42 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 24 Sep 2012 18:42:13 +0000 (11:42 -0700)
commit3fe05bd9980df7207a35b4841a94dc2875e86960
treeb5bb9287088955d2b4b4552b4a4ca9c4c40769a4
parent6bfc82ff589a00e5fbc12b958c649d703d273c86
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge tag 'v3.6-rc6' into devel-dt

Linux 3.6-rc6
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/timer.c
arch/arm/plat-omap/sram.c
drivers/tty/serial/imx.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c