Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
629c58bac0
linux/drivers/net/wan
History
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
..
lmc Fix common misspellings 2011-03-31 11:26:23 -03:00
.gitignore
c101.c drivers/net/wan: Adjust confusing if indentation 2010-08-16 21:06:25 -07:00
cosa.c Fix common misspellings 2011-03-31 11:26:23 -03:00
cosa.h
cycx_drv.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
cycx_main.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
cycx_x25.c
dlci.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
dscc4.c Fix common misspellings 2011-03-31 11:26:23 -03:00
farsync.c farsync: Fix compile warnings. 2010-08-10 00:06:58 -07:00
farsync.h
hd64570.c
hd64570.h
hd64572.c WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers. 2010-12-12 15:03:00 -08:00
hd64572.h
hdlc_cisco.c ipv4: ip_ptr cleanups 2010-09-15 22:06:05 -07:00
hdlc_fr.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
hdlc_ppp.c
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c
hdlc.c Fix typo interrest[ing|ed] => interest[ing|ed] 2010-09-21 17:05:44 +02:00
hostess_sv11.c Fix common misspellings 2011-03-31 11:26:23 -03:00
ixp4xx_hss.c Fix common misspellings 2011-03-31 11:26:23 -03:00
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
lapbether.c net: call dev_alloc_name from register_netdevice 2011-05-05 10:57:45 -07:00
Makefile
n2.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
pc300_drv.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
pc300_tty.c tiocmset: kill the file pointer argument 2011-02-17 11:52:43 -08:00
pc300-falc-lh.h
pc300.h
pc300too.c
pci200syn.c drivers/net/wan: Adjust confusing if indentation 2010-08-16 21:06:25 -07:00
sbni.c
sbni.h
sdla.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
sealevel.c
wanxl.c
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c tty: make receive_buf() return the amout of bytes received 2011-04-22 17:31:53 -07:00
x25_asy.h
z85230.c Fix common misspellings 2011-03-31 11:26:23 -03:00
z85230.h