From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Aug 2012 16:48:31 +0000 (-0700)
Subject: Merge tty-next into 3.6-rc1
X-Git-Tag: v5.15~21594^2~174
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c87985a3ce723995fc7b25e598238d67154108a1;p=mirror_ubuntu-kernels.git

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

c87985a3ce723995fc7b25e598238d67154108a1
diff --cc drivers/usb/serial/keyspan.c
index 6225199119c0,af0b70eaf032..7bcbb47e1449
--- a/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);
  }