1
0
Fork 0
alistair23-linux/drivers/isdn/gigaset
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
..
Kconfig isdn/gigaset: remove EXPERIMENTAL tag from GIGASET_CAPI 2010-07-07 16:57:56 -07:00
Makefile gigaset: add Kernel CAPI interface (v3) 2009-10-06 22:43:53 -07:00
asyncdata.c isdn/gigaset: honor CAPI application's buffer size request 2010-06-25 21:16:59 -07:00
bas-gigaset.c isdn: gigaset: Fix set-but-unused variable. 2011-04-17 16:22:33 -07:00
capi.c ISDN, Gigaset: Fix memory leak in do_disconnect_req() 2010-12-31 11:17:10 -08:00
common.c isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
dummyll.c gigaset: fix build failure 2010-03-17 14:22:07 -07:00
ev-layer.c kstrtox: convert drivers/isdn/ 2011-03-30 21:39:22 -07:00
gigaset.h isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
i4l.c isdn/gigaset: drop obsolete debug option 2010-10-01 00:33:34 -07:00
interface.c tty: now phase out the ioctl file pointer for good 2011-02-17 11:59:56 -08:00
isocdata.c isdn/gigaset: correct bas_gigaset rx buffer handling 2010-10-01 00:33:33 -07:00
proc.c gigaset: include cleanup cleanup 2010-04-18 02:33:29 -07:00
ser-gigaset.c tty: make receive_buf() return the amout of bytes received 2011-04-22 17:31:53 -07:00
usb-gigaset.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00