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)
Linux 3.6-rc6

1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge