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>

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