David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
bnep	net/*: Fix FSF address in file headers	2013-12-06 12:37:57 -05:00
cmtp
hidp
rfcomm
a2mp.c
a2mp.h
af_bluetooth.c	Bluetooth: Increase minor version of core module	2013-12-07 21:29:43 +04:00
amp.c
amp.h
hci_conn.c
hci_core.c	Bluetooth: Use macros for connectionless slave broadcast features	2013-12-09 00:02:41 +04:00
hci_event.c	Bluetooth: Refactor hci_disconn_complete_evt	2013-12-04 11:09:04 -02:00
hci_sock.c	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2013-12-18 13:46:08 -05:00
hci_sysfs.c
Kconfig
l2cap_core.c	Bluetooth: Fix handling of L2CAP Command Reject over LE	2013-12-10 01:15:44 -08:00
l2cap_sock.c	Bluetooth: Simplify l2cap_chan initialization for LE CoC	2013-12-05 07:05:36 -08:00
lib.c
Makefile
mgmt.c	Bluetooth: Add an extra check in mgmt_device_disconnected()	2013-12-04 11:09:03 -02:00
sco.c
smp.c	Bluetooth: Add smp_sufficient_security helper function	2013-12-05 07:05:33 -08:00
smp.h	Bluetooth: Add smp_sufficient_security helper function	2013-12-05 07:05:33 -08:00