Merge 3.6-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 00:31:36 +0000 (17:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Sep 2012 00:31:36 +0000 (17:31 -0700)
commit7ac3c93e5dd74486ca4f8f0b02ae55182658d2e5
tree08b949c872aefbc0f8e12bdcc4dc82297bdd0f2e
parent23666a74c9f552bc9cfef20ded1b8b29bedb80c6
parent5698bd757d55b1bb87edd1a9744ab09c142abfc2
Merge 3.6-rc6 into tty-next

This pulls in the fixes in 3.6-rc6

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-ux500/board-mop500.c
drivers/tty/serial/imx.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c