dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/drivers/staging/ccg
Linus Torvalds c6bd5bcc49 TTY/Serial merge for 3.8-rc1
Here's the big tty/serial tree set of changes for 3.8-rc1.
 
 Contained in here is a bunch more reworks of the tty port layer from Jiri and
 bugfixes from Alan, along with a number of other tty and serial driver updates
 by the various driver authors.
 
 Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the TTY
 layer, which is much appreciated by me.
 
 All of these have been in the linux-next tree for a while.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
 iEYEABECAAYFAlDHhgwACgkQMUfUDdst+ynI6wCcC+YeBwncnoWHvwLAJOwAZpUL
 bysAn28o780/lOsTzp3P1Qcjvo69nldo
 =hN/g
 -----END PGP SIGNATURE-----

Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull TTY/Serial merge from Greg Kroah-Hartman:
 "Here's the big tty/serial tree set of changes for 3.8-rc1.

  Contained in here is a bunch more reworks of the tty port layer from
  Jiri and bugfixes from Alan, along with a number of other tty and
  serial driver updates by the various driver authors.

  Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the
  TTY layer, which is much appreciated by me.

  All of these have been in the linux-next tree for a while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fixed up some trivial conflicts in the staging tree, due to the fwserial
driver having come in both ways (but fixed up a bit in the serial tree),
and the ioctl handling in the dgrp driver having been done slightly
differently (staging tree got that one right, and removed both
TIOCGSOFTCAR and TIOCSSOFTCAR).

* tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (146 commits)
  staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()
  staging/fwserial: Remove superfluous free
  staging/fwserial: Use WARN_ONCE when port table is corrupted
  staging/fwserial: Destruct embedded tty_port on teardown
  staging/fwserial: Fix build breakage when !CONFIG_BUG
  staging: fwserial: Add TTY-over-Firewire serial driver
  drivers/tty/serial/serial_core.c: clean up HIGH_BITS_OFFSET usage
  staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user()
  staging: dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp driver
  serial: ifx6x60: Add modem power off function in the platform reboot process
  serial: mxs-auart: unmap the scatter list before we copy the data
  serial: mxs-auart: disable the Receive Timeout Interrupt when DMA is enabled
  serial: max310x: Setup missing "can_sleep" field for GPIO
  tty/serial: fix ifx6x60.c declaration warning
  serial: samsung: add devicetree properties for non-Exynos SoCs
  serial: samsung: fix potential soft lockup during uart write
  tty: vt: Remove redundant null check before kfree.
  tty/8250 Add check for pci_ioremap_bar failure
  tty/8250 Add support for Commtech's Fastcom Async-335 and Fastcom Async-PCIe cards
  tty/8250 Add XR17D15x devices to the exar_handle_irq override
  ...
2012-12-11 14:08:47 -08:00
..
Kconfig USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
Makefile staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
TODO
ccg.c staging: ccg: rename ccg init and exit functions to conventional names 2012-10-22 15:50:07 -07:00
composite.c usb: gadget: remove global variable composite in composite.c 2012-09-10 15:35:41 +03:00
composite.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
config.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
epautoconf.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
f_acm.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
f_fs.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
f_mass_storage.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
f_rndis.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
gadget_chips.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
ndis.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
rndis.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
rndis.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
storage_common.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
sysfs-class-ccg_usb
u_ether.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
u_ether.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
u_serial.c TTY: call tty_port_destroy in the rest of drivers 2012-11-15 17:20:58 -08:00
u_serial.h staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00
usbstring.c staging: ccg: include all sourced files 2012-09-10 15:35:35 +03:00