Linus Torvalds 99dff58562 Merge branch 'tty-next' of git://git.kernel.org/pub/scm/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.
2011-05-23 12:23:20 -07:00
..
2011-03-30 07:17:16 +09:00
2010-11-22 14:04:41 +00:00
2011-03-30 07:17:31 +09:00
2011-03-30 07:17:01 +09:00
2011-05-19 14:10:45 -07:00
2011-05-19 14:10:45 -07:00
2011-03-31 11:26:23 -03:00
2011-03-07 11:46:01 +00:00
2010-11-06 11:28:29 -04:00
2011-05-12 17:40:05 +02:00
2011-05-19 14:10:45 -07:00
2008-11-17 11:45:39 +00:00
2011-03-31 11:26:23 -03:00
2011-05-19 14:10:45 -07:00
2011-03-11 12:07:31 +00:00
2011-03-11 12:01:44 +00:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-02-25 12:58:36 +00:00
2010-11-22 14:04:41 +00:00
2011-03-31 11:26:23 -03:00
2010-11-24 11:33:12 +00:00
2011-03-31 11:26:23 -03:00
2010-11-22 14:04:41 +00:00
2010-11-06 11:35:39 -04:00
2010-11-22 14:04:41 +00:00
2010-09-30 13:32:21 -07:00
2011-03-31 11:26:23 -03:00
2011-04-11 13:33:50 -07:00
2011-03-31 11:26:23 -03:00
2010-11-22 14:04:41 +00:00
2010-09-15 16:11:24 +01:00
2011-03-31 11:26:23 -03:00
2011-03-22 18:41:28 +00:00
2011-03-31 11:26:23 -03:00