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

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/xtensa/platforms/iss/console.c
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/serial/imx.c
Simple merge

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

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

diff --cc drivers/usb/gadget/u_serial.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.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 include/linux/Kbuild
Simple merge