Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
629c58bac0
linux/drivers/net/irda
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
..
act200l-sir.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
actisys-sir.c
ali-ircc.c treewide: fix a few typos in comments 2011-05-10 10:16:21 +02:00
ali-ircc.h
au1k_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
au1000_ircc.h
bfin_sir.c net/irda: bfin_sir: IRDA is not affected by anomaly 05000230 2010-05-23 23:57:45 -07:00
bfin_sir.h net/irda: bfin_sir: back out transitional defines 2011-01-10 07:18:03 -05:00
donauboe.c Fix common misspellings 2011-03-31 11:26:23 -03:00
donauboe.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ep7211-sir.c
esi-sir.c
girbil-sir.c Fix common misspellings 2011-03-31 11:26:23 -03:00
irda-usb.c Fix common misspellings 2011-03-31 11:26:23 -03:00
irda-usb.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
irtty-sir.c tty: make receive_buf() return the amout of bytes received 2011-04-22 17:31:53 -07:00
irtty-sir.h
Kconfig net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
kingsun-sir.c
ks959-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
ksdazzle-sir.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
litelink-sir.c
ma600-sir.c
Makefile net/irda: Add SuperH IrDA driver support 2010-04-06 19:50:21 -07:00
mcp2120-sir.c
mcs7780.c Fix common misspellings 2011-03-31 11:26:23 -03:00
mcs7780.h
nsc-ircc.c Fix common misspellings 2011-03-31 11:26:23 -03:00
nsc-ircc.h Fix common misspellings 2011-03-31 11:26:23 -03:00
old_belkin-sir.c
pxaficp_ir.c Fix common misspellings 2011-03-31 11:26:23 -03:00
sa1100_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
sh_irda.c net/irda/sh_irda: return to RX mode when TX error 2011-01-18 16:13:51 -08:00
sh_sir.c SuperH IrDA: correct Baud rate error correction 2010-11-21 10:09:53 -08:00
sir_dev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
sir_dongle.c
sir-dev.h
smsc-ircc2.c net: fix section mismatches 2011-04-18 22:59:04 -07:00
smsc-ircc2.h
smsc-sio.h
stir4200.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
tekram-sir.c
toim3232-sir.c
via-ircc.c Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 2011-04-07 11:14:49 -07:00
via-ircc.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
vlsi_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
vlsi_ir.h Fix common misspellings 2011-03-31 11:26:23 -03:00
w83977af_ir.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
w83977af_ir.h
w83977af.h