David S. Miller aa11d958d1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: arch/microblaze/include/asm/socket.h		2009-08-12 17:44:53 -07:00
..
bnep	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
cmtp
hidp
rfcomm	bluetooth: rfcomm_init bug fix	2009-08-03 13:24:39 -07:00
af_bluetooth.c	net: mark read-only arrays as const	2009-08-05 10:42:58 -07:00
hci_conn.c
hci_core.c
hci_event.c
hci_sock.c
hci_sysfs.c
Kconfig
l2cap.c
lib.c
Makefile
sco.c