p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/bluetooth
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
..
Kconfig Bluetooth: btmrvl: support Marvell Bluetooth device SD8787 2011-04-13 12:20:05 -03:00
Makefile Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
ath3k.c Bluetooth: Device ids for ath3k on Pegatron Lucid tablets 2011-05-11 14:50:40 -03:00
bcm203x.c Bluetooth: Use kmemdup for drivers 2010-07-21 10:39:06 -07:00
bfusb.c Bluetooth: Convert controller hdev->type to hdev->bus 2010-02-27 14:05:38 +01:00
bluecard_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
bpa10x.c Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
bt3c_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btmrvl_debugfs.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
btmrvl_drv.h Bluetooth: Use __packed annotation for drivers 2010-07-21 10:39:13 -07:00
btmrvl_main.c Bluetooth: HCI devices are either BR/EDR or AMP radios 2010-10-12 12:44:51 -03:00
btmrvl_sdio.c Bluetooth: btmrvl: support Marvell Bluetooth device SD8787 2011-04-13 12:20:05 -03:00
btmrvl_sdio.h Bluetooth: btmrvl: support Marvell Bluetooth device SD8787 2011-04-13 12:20:05 -03:00
btsdio.c Bluetooth: Support SDIO devices that are AMP controllers 2010-10-12 12:44:51 -03:00
btuart_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
btusb.c Bluetooth: Device ids for ath3k on Pegatron Lucid tablets 2011-05-11 14:50:40 -03:00
btwilink.c Bluetooth: btwilink driver 2011-02-23 14:39:10 -08:00
dtl1_cs.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
hci_ath.c Bluetooth: hci_uart: check the return value of recv() 2011-04-13 12:20:03 -03:00
hci_bcsp.c Bluetooth: Add __init and __exit marks to UART drivers 2010-07-27 12:35:58 -07:00
hci_h4.c Bluetooth: Check return value of hci_recv_stream_fragment() 2011-04-13 12:20:04 -03:00
hci_ldisc.c Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-05-23 12:23:20 -07:00
hci_ll.c Fix common misspellings 2011-03-31 11:26:23 -03:00
hci_uart.h Bluetooth: Support for Atheros AR300x serial chip 2010-07-21 10:39:14 -07:00
hci_vhci.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00