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	net/*: Fix FSF address in file headers	2013-12-06 12:37:57 -05:00
cmtp	Bluetooth: Access CMTP session addresses through L2CAP channel	2013-10-13 20:00:30 +03:00
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: move 6lowpan header to include/net	2014-03-06 17:21:38 -05:00
6lowpan.h	Bluetooth: make bluetooth 6lowpan as an option	2014-03-11 07:54:55 -07:00
a2mp.c	Bluetooth: Convert uses of __constant_<foo> to <foo>	2014-03-12 11:10:17 -07:00
a2mp.h	Bluetooth: Move a2mp.h header file into net/bluetooth/	2013-10-11 00:10:05 +02:00
af_bluetooth.c	Bluetooth: Increase minor version of core module	2014-02-21 06:21:55 +02:00
amp.c	Bluetooth: Remove l2cap_conn->dst usage from AMP manager	2013-10-13 17:43:32 +03:00
amp.h	Bluetooth: Move amp.h header file into net/bluetooth/	2013-10-11 00:10:03 +02:00
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	Bluetooth: Convert to use ATTRIBUTE_GROUPS macro	2014-02-13 09:51:34 +02:00
Kconfig	Bluetooth: make sure 6LOWPAN_IPHC is built-in if needed	2014-03-13 07:05:10 -07:00
l2cap_core.c	Bluetooth: Convert uses of __constant_<foo> to <foo>	2014-03-12 11:10:17 -07:00
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	Bluetooth: Add error mapping for Directed Advertising Timeout	2014-03-26 09:31:36 -07:00
Makefile	Bluetooth: make bluetooth 6lowpan as an option	2014-03-11 07:54:55 -07:00
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	Bluetooth: Remove unnecessary assignment in SMP	2014-03-24 08:43:50 -07:00
smp.h	Bluetooth: Remove LTK re-encryption procedure	2014-03-24 07:51:56 -07:00