Merge remote-tracking branch 'tty/tty-next'

Conflicts:
	drivers/tty/serial/omap-serial.c

diff --cc arch/xtensa/platforms/iss/console.c
Simple merge

diff --cc drivers/tty/Kconfig
Simple merge

diff --cc drivers/tty/hvc/hvc_console.c
Simple merge

diff --cc drivers/tty/hvc/hvsi.c
Simple merge

diff --cc drivers/tty/ipwireless/network.c
Simple merge

diff --cc drivers/tty/serial/8250/8250_pci.c
Simple merge

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

diff --cc drivers/tty/serial/omap-serial.c
index 0952d71bdf28e03b692667632ab9ddd9b5892c09,ccc2f35adff1dd8c27d86676461e6c094f7e68aa..6ede6fd92b4cd00e939dca479e0f3e3a0a0d923e
--- 1/drivers/tty/serial/omap-serial.c
--- 2/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@@ -1203,10 -1226,8 +1226,8 @@@ static int serial_omap_suspend(struct d
  {
        struct uart_omap_port *up = dev_get_drvdata(dev);
  
-       if (up) {
-               uart_suspend_port(&serial_omap_reg, &up->port);
-               flush_work(&up->qos_work);
-       }
+       uart_suspend_port(&serial_omap_reg, &up->port);
 -      flush_work_sync(&up->qos_work);
++      flush_work(&up->qos_work);
  
        return 0;
  }

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/tty/tty_ldisc.c
Simple merge

diff --cc firmware/Makefile
index 76628e32fed6c64d10febbaa5c01686c5df30985,fdc9ff045ef8c3073519115b0e383bd65e97c333..eeb14030d8a24e67f113d65f1da1578d04b3de89
--- 1/firmware/Makefile
--- 2/firmware/Makefile
+++ b/firmware/Makefile
@@@ -40,9 -40,9 +40,8 @@@ fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-
                             bnx2/bnx2-mips-06-6.2.1.fw \
                             bnx2/bnx2-rv2p-06-6.0.15.fw
  fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
- fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
  fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
                                   cxgb3/t3c_psram-1.1.0.bin \
 -                                 cxgb3/t3fw-7.10.0.bin \
                                   cxgb3/ael2005_opt_edc.bin \
                                   cxgb3/ael2005_twx_edc.bin \
                                   cxgb3/ael2020_twx_edc.bin

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

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