David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
bnep
cmtp
hidp	Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus	2014-04-01 19:05:09 +02:00
rfcomm	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
6lowpan.c
6lowpan.h
a2mp.c
a2mp.h
af_bluetooth.c
amp.c
amp.h
hci_conn.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
hci_core.c	Bluetooth: Add new debugfs parameter	2014-03-28 00:09:30 -07:00
hci_event.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
hci_sock.c	Bluetooth: Return EOPNOTSUPP for HCISETRAW ioctl command	2014-04-24 11:55:25 -03:00
hci_sysfs.c
Kconfig
l2cap_core.c
l2cap_sock.c	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
lib.c
Makefile
mgmt.c	Bluetooth: Refactor code for outgoing dedicated bonding	2014-04-11 10:33:08 -07:00
sco.c	net: Fix use after free by removing length arg from sk_data_ready callbacks.	2014-04-11 16:15:36 -04:00
smp.c
smp.h