linux/drivers/net/hamradio
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
..
6pack.c tty: make receive_buf() return the amout of bytes received 2011-04-22 17:31:53 -07:00
baycom_epp.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
baycom_par.c Remove multiple KERN_ prefixes from printk formats 2009-07-08 10:30:03 -07:00
baycom_ser_fdx.c net/various: remove trailing space in messages 2010-03-24 14:10:38 -07:00
baycom_ser_hdx.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
bpqether.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
dmascc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hdlcdrv.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile Fix common misspellings 2011-03-31 11:26:23 -03:00
mkiss.c tty: make receive_buf() return the amout of bytes received 2011-04-22 17:31:53 -07:00
scc.c drivers/net/hamradio: Adjust confusing if indentation 2010-08-16 21:06:29 -07:00
yam.c Fix common misspellings 2011-03-31 11:26:23 -03:00
z8530.h