David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net ...

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c

2011-09-22 03:23:13 -04:00

..

bnep

Merge branch 'master' of github.com:davem330/net

2011-09-22 03:23:13 -04:00

cmtp

Bluetooth: cmtp: Fix session cleanup on failed conn add

2011-08-11 19:50:28 -03:00

hidp

Bluetooth: hidp: Don't release device ref if never held

2011-08-11 19:50:28 -03:00

rfcomm

Bluetooth: rfcomm: Fix lost wakeups waiting to accept socket

2011-08-11 19:50:26 -03:00

af_bluetooth.c

Bluetooth: Fix lost wakeups waiting for sock state change

2011-08-11 19:50:26 -03:00

hci_conn.c

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

2011-07-14 07:56:40 -07:00

hci_core.c

Bluetooth: Don't use cmd_timer to timeout HCI reset command

2011-08-11 19:50:27 -03:00

hci_event.c

Bluetooth: Fix timeout on scanning for the second time

2011-09-15 11:54:05 -03:00

hci_sock.c

Bluetooth: Move blacklisting functions to hci_core

2011-06-16 15:19:41 -03:00

hci_sysfs.c

Bluetooth: Add variable SSP auto-accept delay support

2011-04-28 16:02:30 -03:00

Kconfig

bluetooth: uses crypto interfaces, select CRYPTO

2011-06-27 15:09:39 -04:00

l2cap_core.c

Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks

2011-08-11 19:50:27 -03:00

l2cap_sock.c

Bluetooth: Fixed wrong L2CAP Sock timer value

2011-08-11 19:50:27 -03:00

lib.c

Bluetooth: Add bt_printk

2011-06-30 19:17:12 -03:00

Makefile

Bluetooth: Implement the first SMP commands

2011-06-13 15:11:55 -03:00

mgmt.c

Bluetooth: Add support for storing the key size

2011-07-08 18:39:19 -03:00

sco.c

Bluetooth: sco: Fix lost wakeups waiting to accept socket

2011-08-11 19:50:26 -03:00

smp.c

Bluetooth: Add support for storing the key size

2011-07-08 18:39:19 -03:00