David S. Miller 11fe883936 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/vhost/net.c net/bridge/br_device.c Fix merge conflict in drivers/vhost/net.c with guidance from Stephen Rothwell. Revert the effects of net-2.6 commit 573201f36f since net-next-2.6 has fixes that make bridge netpoll work properly thus we don't need it disabled. Signed-off-by: David S. Miller <davem@davemloft.net>		2010-07-20 18:25:24 -07:00
..
bnep	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-07 15:59:38 -07:00
cmtp	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
hidp	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
rfcomm	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
af_bluetooth.c	net: sk_sleep() helper	2010-04-20 16:37:13 -07:00
hci_conn.c	Bluetooth: Update sec_level/auth_type for already existing connections	2010-07-08 20:35:31 -03:00
hci_core.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00
hci_event.c	Bluetooth: Reset the security level after an authentication failure	2010-07-08 20:35:27 -03:00
hci_sock.c	Bluetooth: Fix out of scope variable access in hci_sock_cmsg()	2010-02-28 00:47:30 -08:00
hci_sysfs.c	Bluetooth: Use strict_strtoul instead of simple_strtoul	2010-05-10 09:34:04 +02:00
Kconfig	Bluetooth: Add Kconfig option for L2CAP Extended Features	2010-05-10 09:28:51 +02:00
l2cap.c	Bluetooth: Check L2CAP pending status before sending connect request	2010-07-08 20:35:23 -03:00
lib.c
Makefile
sco.c	net: Remove unnecessary returns from void function()s	2010-05-17 23:23:14 -07:00