Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
	drivers/char/pcmcia/synclink_cs.c

diff --cc drivers/char/pcmcia/synclink_cs.c
index 3f57d5de395723e03cf6b6c4148760d3ca043240,a6b8ddea222702ef1499152365848fb2c00fb80f..21721d25e388f2ee6fa3eeed14d4abd550518f4f
--- 1/drivers/char/pcmcia/synclink_cs.c
--- 2/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@@ -1050,7 -1058,7 +1058,7 @@@ static void cts_change(MGSLPC_INFO *inf
        wake_up_interruptible(&info->status_event_wait_q);
        wake_up_interruptible(&info->event_wait_q);
  
-       if (tty_port_cts_enabled(&info->port)) {
 -      if (tty && (info->port.flags & ASYNC_CTS_FLOW)) {
++      if (tty && tty_port_cts_enabled(&info->port)) {
                if (tty->hw_stopped) {
                        if (info->serial_signals & SerialSignal_CTS) {
                                if (debug_level >= DEBUG_LEVEL_ISR)