David S. Miller b4aa9e05a6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c		2010-12-17 12:27:22 -08:00
..
bnep	Bluetooth: bnep: fix information leak to userland	2010-12-01 21:04:35 -02:00
cmtp	Bluetooth: cmtp: fix information leak to userland	2010-12-01 21:04:35 -02:00
hidp	Bluetooth: hidp: fix information leak to userland	2010-12-01 21:04:36 -02:00
rfcomm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-17 12:27:22 -08:00
af_bluetooth.c	Bluetooth: Add common code for stream-oriented recvmsg()	2010-10-12 12:44:51 -03:00
hci_conn.c	Bluetooth: clean up hci code	2010-12-01 21:04:43 -02:00
hci_core.c	Bluetooth: clean up hci code	2010-12-01 21:04:43 -02:00
hci_event.c	Bluetooth: clean up hci code	2010-12-01 21:04:43 -02:00
hci_sock.c	Bluetooth: clean up hci code	2010-12-01 21:04:43 -02: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: clean up l2cap code	2010-12-01 21:04:43 -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: clean up sco code	2010-12-01 21:04:43 -02:00