John W. Linville 515db09338 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... Conflicts: drivers/net/wireless/iwlegacy/iwl-debugfs.c drivers/net/wireless/iwlegacy/iwl-rx.c drivers/net/wireless/iwlegacy/iwl-scan.c drivers/net/wireless/iwlegacy/iwl-tx.c include/net/bluetooth/bluetooth.h		2011-11-22 14:05:46 -05:00
..
bnep	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
cmtp	Bluetooth: replace list_for_each with list_for_each_entry whenever possible	2011-11-07 17:24:46 -02:00
hidp	Bluetooth: Fix hidp_get_connection()	2011-11-07 17:24:55 -02:00
rfcomm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05: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: Handle fragmented skbs in bt_sock_stream_recvmsg()	2011-09-27 18:16:07 -03:00
hci_conn.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
hci_core.c	Bluetooth: Fix cancel_delayed_work_sync usage with locks	2011-11-09 12:33:52 -02:00
hci_event.c	Bluetooth: Add missing hci_dev locking when calling mgmt functions	2011-11-09 12:33:46 -02:00
hci_sock.c	Bluetooth: Add mgmt events for blacklisting	2011-09-21 12:59:15 -03:00
hci_sysfs.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2011-11-22 14:05:46 -05:00
l2cap_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next	2011-11-09 14:54:33 -05:00
l2cap_sock.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2011-11-22 14:05:46 -05:00
lib.c	Bluetooth: Add bt_printk	2011-06-30 19:17:12 -03:00
mgmt.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2011-11-22 14:05:46 -05:00
sco.c	bluetooth: Properly clone LSM attributes to newly created child connections	2011-10-18 23:36:43 -04:00
smp.c	Bluetooth: prioritizing data over HCI	2011-11-07 17:24:56 -02:00