Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial patches from Greg Kroah-Hartman:
 "Here's the big tty/serial driver patches for 3.9-rc1.

  More tty port rework and fixes from Jiri here, as well as lots of
  individual serial driver updates and fixes.

  All of these have been in the linux-next tree for a while."

* tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits)
  tty: mxser: improve error handling in mxser_probe() and mxser_module_init()
  serial: imx: fix uninitialized variable warning
  serial: tegra: assume CONFIG_OF
  TTY: do not update atime/mtime on read/write
  lguest: select CONFIG_TTY to build properly.
  ARM defconfigs: add missing inclusions of linux/platform_device.h
  fb/exynos: include platform_device.h
  ARM: sa1100/assabet: include platform_device.h directly
  serial: imx: Fix recursive locking bug
  pps: Fix build breakage from decoupling pps from tty
  tty: Remove ancient hardpps()
  pps: Additional cleanups in uart_handle_dcd_change
  pps: Move timestamp read into PPS code proper
  pps: Don't crash the machine when exiting will do
  pps: Fix a use-after free bug when unregistering a source.
  pps: Use pps_lookup_dev to reduce ldisc coupling
  pps: Add pps_lookup_dev() function
  tty: serial: uartlite: Support uartlite on big and little endian systems
  tty: serial: uartlite: Fix sparse and checkpatch warnings
  serial/arc-uart: Miscll DT related updates (Grant's review comments)
  ...

Fix up trivial conflicts, mostly just due to the TTY config option
clashing with the EXPERIMENTAL removal.

diff --cc arch/alpha/Kconfig
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/tile/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
index 9b94a78,cf474b2..8bb810e
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -802,6 -803,7 +802,7 @@@ config I2C_PARPORT_LIGH
  
  config I2C_TAOS_EVM
        tristate "TAOS evaluation module"
 -      depends on EXPERIMENTAL && TTY
++      depends on TTY
        select SERIO
        select SERIO_SERPORT
        default n

diff --cc drivers/input/serio/Kconfig
Simple merge

diff --cc drivers/isdn/gigaset/interface.c
Simple merge

diff --cc drivers/lguest/Kconfig
index 6cdcdb0,f9c4314..89875ea
--- 1/drivers/lguest/Kconfig
--- 2/drivers/lguest/Kconfig
+++ b/drivers/lguest/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
  config LGUEST
        tristate "Linux hypervisor example code"
-       depends on X86_32 && EVENTFD
 -      depends on X86_32 && EXPERIMENTAL && EVENTFD && TTY
++      depends on X86_32 && EVENTFD && TTY
        select HVC_DRIVER
        ---help---
          This is a very simple module which allows you to run

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/net/can/Kconfig
index 1cca19f,72df3a3..9862b2e
--- 1/drivers/net/can/Kconfig
--- 2/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@@ -11,6 -13,7 +11,7 @@@ config CAN_VCA
  
  config CAN_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"
 -      depends on CAN && TTY
++      depends on TTY
        ---help---
          CAN driver for several 'low cost' CAN interfaces that are attached
          via serial lines or via USB-to-serial adapters using the LAWICEL

diff --cc drivers/net/irda/Kconfig
Simple merge

diff --cc drivers/net/ppp/Kconfig
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc drivers/net/usb/hso.c
Simple merge

diff --cc drivers/net/wan/Kconfig
index 13daec8,61eb899..94e2349
--- 1/drivers/net/wan/Kconfig
--- 2/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@@ -374,8 -428,8 +374,8 @@@ config LAPBETHE
          If unsure, say N.
  
  config X25_ASY
 -      tristate "X.25 async driver (EXPERIMENTAL)"
 +      tristate "X.25 async driver"
-       depends on LAPB && X25
+       depends on LAPB && X25 && TTY
        ---help---
          Send and receive X.25 frames over regular asynchronous serial
          lines such as telephone lines equipped with ordinary modems.

diff --cc drivers/staging/fwserial/fwserial.c
Simple merge

diff --cc drivers/staging/speakup/selection.c
Simple merge

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

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

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

diff --cc drivers/usb/gadget/Kconfig
index c5c6fa6,a1bd951..5a0c541
--- 1/drivers/usb/gadget/Kconfig
--- 2/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -762,8 -750,7 +762,9 @@@ config USB_GADGET_TARGE
  
  config USB_G_SERIAL
        tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
+       depends on TTY
 +      select USB_U_SERIAL
 +      select USB_F_ACM
        select USB_LIBCOMPOSITE
        help
          The Serial Gadget talks to the Linux-USB generic serial driver.

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

diff --cc drivers/usb/serial/Kconfig
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc lib/Kconfig.kgdb
Simple merge

diff --cc sound/soc/codecs/Kconfig
index 133025f,298822c..45b7256
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -34,9 -34,8 +34,9 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
-       select SND_SOC_CX20442
+       select SND_SOC_CX20442 if TTY
        select SND_SOC_DA7210 if I2C
 +      select SND_SOC_DA7213 if I2C
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DFBMCS320