John W. Linville 57adc1fcba Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem ...

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

2012-01-03 15:16:34 -05:00

..

bnep

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

cmtp

Bluetooth: Always compile SCO and L2CAP in Bluetooth Core

2011-12-21 02:21:08 -02:00

hidp

Bluetooth: Always compile SCO and L2CAP in Bluetooth Core

2011-12-21 02:21:08 -02:00

rfcomm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

af_bluetooth.c

Bluetooth: fix bt_accept_dequeue() to work in process context

2011-12-22 14:02:08 -02:00

hci_conn.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2011-12-23 17:13:56 -05:00

hci_core.c

Bluetooth: Don't disable interrupt when locking the queue

2011-12-22 18:07:01 -02:00

hci_event.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

hci_sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

hci_sysfs.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

2011-12-19 14:28:22 -05:00

Kconfig

Bluetooth: Always compile SCO and L2CAP in Bluetooth Core

2011-12-21 02:21:08 -02:00

l2cap_core.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

l2cap_sock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next

2011-12-19 14:28:22 -05:00

lib.c

Bluetooth: Add bt_printk

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

Makefile

Bluetooth: Always compile SCO and L2CAP in Bluetooth Core

2011-12-21 02:21:08 -02:00

mgmt.c

Bluetooth: Add SMP to User Passkey and Confirm

2011-12-22 14:19:03 -02:00

sco.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03 15:16:34 -05:00

smp.c

Bluetooth: Incorrect address while storing LTK.

2011-12-23 16:55:06 -02:00