David S. Miller fe6c791570 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

2010-12-08 13:47:38 -08:00

..

bnep

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-07-07 15:59:38 -07:00

cmtp

Bluetooth: make batostr() print in the right order

2010-10-12 12:44:52 -03:00

hidp

Bluetooth: fix hidp kconfig dependency warning

2010-11-09 00:55:27 -02:00

rfcomm

Bluetooth: fix not setting security level when creating a rfcomm session

2010-11-09 00:56:10 -02:00

af_bluetooth.c

Bluetooth: Add common code for stream-oriented recvmsg()

2010-10-12 12:44:51 -03:00

hci_conn.c

Bluetooth: Defer SCO setup if mode change is pending

2010-07-27 12:29:04 -07:00

hci_core.c

Bluetooth: Don't clear the blacklist when closing the HCI device

2010-10-12 12:44:52 -03:00

hci_event.c

Bluetooth: Fix non-SSP auth request for HIGH security level sockets

2010-11-09 00:55:27 -02:00

hci_sock.c

Bluetooth: Use list_head for HCI blacklist head

2010-07-31 16:06:58 -07: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: fix endianness conversion in L2CAP

2010-11-09 00:56:09 -02:00

lib.c

Bluetooth: make batostr() print in the right order

2010-10-12 12:44:52 -03:00

Makefile

Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions

2010-11-22 08:16:08 -08:00

sco.c

Bluetooth: Fix not returning proper error in SCO

2010-11-22 18:23:18 -02:00