David S. Miller a2bfbc072e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/can/Kconfig		2009-11-17 00:05:02 -08:00
..
bnep	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
cmtp	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
hidp	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
rfcomm	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
af_bluetooth.c	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
hci_conn.c	Bluetooth: Set general bonding security for ACL by default	2009-11-16 01:30:28 +01:00
hci_core.c
hci_event.c
hci_sock.c	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00
hci_sysfs.c	bluetooth: scheduling while atomic bug fix	2009-10-19 19:36:45 -07:00
Kconfig
l2cap.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-17 00:05:02 -08:00
lib.c
Makefile
sco.c	net: pass kern to net_proto_family create function	2009-11-05 22:18:14 -08:00