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	isdn: rename capi_ctr_reseted() to capi_ctr_down()	2009-06-08 00:45:50 -07:00
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	Bluetooth: Don't use hci_acl_connect_cancel() for incoming connections	2009-05-09 18:09:45 -07:00
hci_core.c	Bluetooth: Add native RFKILL soft-switch support for all devices	2009-06-08 14:50:01 +02:00
hci_event.c	Bluetooth: Don't trigger disconnect timeout for security mode 3 pairing	2009-05-09 18:09:52 -07:00
hci_sock.c
hci_sysfs.c	Bluetooth: Remove useless flush_work() causing lockdep warnings	2009-05-27 09:15:57 +02:00
Kconfig	Bluetooth: Fix Kconfig issue with RFKILL integration	2009-06-14 15:30:51 +02:00
l2cap.c	Bluetooth: Remove pointless endian conversion helpers	2009-06-08 14:50:01 +02:00
lib.c
Makefile
sco.c