Merge 3.6-rc6 into tty-next
Greg Kroah-Hartman [Mon, 17 Sep 2012 00:31:36 +0000 (17:31 -0700)]
This pulls in the fixes in 3.6-rc6

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1  2 
arch/arm/mach-ux500/board-mop500.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