linux/net/bluetooth
Linus Torvalds e6bee325e4 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: (76 commits)
  pch_uart: reference clock on CM-iTC
  pch_phub: add new device ML7213
  n_gsm: fix UIH control byte : P bit should be 0
  n_gsm: add a documentation
  serial: msm_serial_hs: Add MSM high speed UART driver
  tty_audit: fix tty_audit_add_data live lock on audit disabled
  tty: move cd1865.h to drivers/staging/tty/
  Staging: tty: fix build with epca.c driver
  pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
  Staging: generic_serial: fix double locking bug
  nozomi: don't use flush_scheduled_work()
  tty/serial: Relax the device_type restriction from of_serial
  MAINTAINERS: Update HVC file patterns
  tty: phase out of ioctl file pointer for tty3270 as well
  tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
  pch_uart: Fix DMA channel miss-setting issue.
  pch_uart: fix exclusive access issue
  pch_uart: fix auto flow control miss-setting issue
  pch_uart: fix uart clock setting issue
  pch_uart : Use dev_xxx not pr_xxx
  ...

Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
2011-03-16 15:11:04 -07:00
..
bnep Bluetooth: bnep: fix information leak to userland 2010-12-01 21:04:35 -02:00
cmtp Bluetooth: cmtp: fix information leak to userland 2010-12-01 21:04:35 -02:00
hidp Bluetooth: hidp: fix information leak to userland 2010-12-01 21:04:36 -02:00
rfcomm Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2011-03-16 15:11:04 -07:00
af_bluetooth.c Bluetooth: Add common code for stream-oriented recvmsg() 2010-10-12 12:44:51 -03:00
hci_conn.c Bluetooth: Fix race condition with conn->sec_level 2011-01-19 14:43:11 -02:00
hci_core.c Bluetooth: Fix leaking blacklist when unregistering a hci device 2011-01-19 14:40:42 -02:00
hci_event.c Bluetooth: Fix race condition with conn->sec_level 2011-01-19 14:43:11 -02:00
hci_sock.c Bluetooth: Improve handling of HCI control channel in bind 2010-12-22 23:00:34 -02:00
hci_sysfs.c Bluetooth: make batostr() print in the right order 2010-10-12 12:44:52 -03:00
Kconfig Bluetooth: Remove L2CAP Extended Features from Kconfig 2010-07-21 10:39:04 -07:00
l2cap.c Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses 2011-02-02 12:47:59 -02:00
lib.c Bluetooth: make batostr() print in the right order 2010-10-12 12:44:52 -03:00
Makefile Bluetooth: Add initial Bluetooth Management interface callbacks 2010-12-07 23:03:38 -02:00
mgmt.c Bluetooth: Add management events for controller addition & removal 2010-12-22 22:58:00 -02:00
sco.c Bluetooth: clean up sco code 2010-12-01 21:04:43 -02:00