John W. Linville 8e00f5fbb4 Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem ... Conflicts: drivers/net/wireless/iwlwifi/iwl-pci.c drivers/net/wireless/wl12xx/main.c		2011-09-30 14:52:29 -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: Add support for NO_INIT_REPORTS quirk	2011-09-21 12:58:12 -03:00
rfcomm	Bluetooth: rfcomm: Fix lost wakeups waiting to accept socket	2011-08-11 19:50:26 -03:00
Kconfig	bluetooth: uses crypto interfaces, select CRYPTO	2011-06-27 15:09:39 -04:00
Makefile	Bluetooth: Implement the first SMP commands	2011-06-13 15:11:55 -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	Bluetooth: Fix wrong memcpy size on LE start encryption	2011-09-21 12:59:16 -03:00
hci_core.c	Bluetooth: Add mgmt events for blacklisting	2011-09-21 12:59:15 -03:00
hci_event.c	Bluetooth: Reduce critical region.	2011-09-21 12:59:16 -03:00
hci_sock.c	Bluetooth: Add mgmt events for blacklisting	2011-09-21 12:59:15 -03:00
hci_sysfs.c	Bluetooth: Add LE link type for debugfs output	2011-09-21 12:58:12 -03:00
l2cap_core.c	Bluetooth: mark l2cap_create_iframe_pdu as static	2011-09-21 12:59:16 -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
mgmt.c	Bluetooth: Check 'dev_class' in mgmt_device_found()	2011-09-21 12:59:16 -03:00
sco.c	Bluetooth: sco: Fix lost wakeups waiting to accept socket	2011-08-11 19:50:26 -03:00
smp.c	Bluetooth: Remove support for other SMP keys than the LTK	2011-09-21 12:59:16 -03:00