David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c		2010-04-11 14:53:53 -07:00
..
bnep	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
cmtp	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hidp	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
rfcomm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-06 08:34:06 -07:00
af_bluetooth.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
hci_conn.c	Bluetooth: Enter active mode before establishing a SCO link.	2010-02-03 19:10:59 -08:00
hci_core.c	Bluetooth: Add controller types for BR/EDR and 802.11 AMP	2010-02-27 14:05:38 +01:00
hci_event.c	Bluetooth: Add SCO fallback for unsupported feature error	2010-02-27 14:06:00 +01: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	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	Bluetooth: Add missing selection of CONFIG_CRC16 for L2CAP layer	2009-08-24 16:34:35 -07:00
l2cap.c	net: check the length of the socket address passed to connect(2)	2010-04-01 17:26:01 -07:00
lib.c	[NET] BLUETOOTH: Fix whitespace errors.	2007-02-10 23:19:20 -08:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sco.c	net: check the length of the socket address passed to connect(2)	2010-04-01 17:26:01 -07:00