Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 19:23:20 +0000 (12:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 23 May 2011 19:23:20 +0000 (12:23 -0700)
commit99dff5856220a02b8711f2e8746413ea6e53ccf6
treed8bae7ccdf8f7ad5221b053bb74a6220df996b3a
parentbb74e8ca352eecefdc5c1a9ebab01f18aa2f6f3c
parentd9a0fbfd7bc5d2c42f0fa9bcbdab62c4942d0388
Merge branch 'tty-next' of git://git./linux/kernel/git/gregkh/tty-2.6

* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (48 commits)
  serial: 8250_pci: add support for Cronyx Omega PCI multiserial board.
  tty/serial: Fix break handling for PORT_TEGRA
  tty/serial: Add explicit PORT_TEGRA type
  n_tracerouter and n_tracesink ldisc additions.
  Intel PTI implementaiton of MIPI 1149.7.
  Kernel documentation for the PTI feature.
  export kernel call get_task_comm().
  tty: Remove to support serial for S5P6442
  pch_phub: Support new device ML7223
  8250_pci: Add support for the Digi/IBM PCIe 2-port Adapter
  ASoC: Update cx20442 for TTY API change
  pch_uart: Support new device ML7223 IOH
  parport: Use request_muxed_region for IT87 probe and lock
  tty/serial: add support for Xilinx PS UART
  n_gsm: Use print_hex_dump_bytes
  drivers/tty/moxa.c: Put correct tty value
  TTY: tty_io, annotate locking functions
  TTY: serial_core, remove superfluous set_task_state
  TTY: serial_core, remove invalid test
  Char: moxa, fix locking in moxa_write
  ...

Fix up trivial conflicts in drivers/bluetooth/hci_ldisc.c and
drivers/tty/serial/Makefile.

I did the hci_ldisc thing as an evil merge, cleaning things up.
14 files changed:
drivers/bluetooth/hci_ldisc.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/misc/ti-st/st_core.c
drivers/net/can/slcan.c
drivers/net/slip.c
drivers/parport/parport_pc.c
drivers/tty/n_gsm.c
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/tty/serial/imx.c
drivers/tty/tty_ioctl.c
fs/exec.c
sound/soc/codecs/cx20442.c