Merge tty-next into 3.6-rc1

This handles the merge issue in:
	arch/um/drivers/line.c
	arch/um/drivers/line.h
And resolves the duplicate patches that were in both trees do to the
tty-next branch not getting merged into 3.6-rc1.

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

diff --cc drivers/net/ethernet/sgi/ioc3-eth.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/serial/keyspan.c
index 6225199,af0b70e..7bcbb47
--- 1/drivers/usb/serial/keyspan.c
--- 2/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@@ -176,10 -176,10 +176,10 @@@ static void keyspan_set_termios(struct 
        tty_encode_baud_rate(tty, baud_rate, baud_rate);
        /* set CTS/RTS handshake etc. */
        p_priv->cflag = cflag;
-       p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+       p_priv->flow_control = (cflag & CRTSCTS) ? flow_cts : flow_none;
  
        /* Mark/Space not supported */
 -      tty->termios->c_cflag &= ~CMSPAR;
 +      tty->termios.c_cflag &= ~CMSPAR;
  
        keyspan_send_setup(port, 0);
  }

diff --cc drivers/usb/serial/quatech2.c
Simple merge

diff --cc drivers/usb/serial/sierra.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge

diff --cc net/bluetooth/rfcomm/tty.c
Simple merge