David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
6lowpan
9p
802
8021q	vlan: turn on unicast filtering on vlan device	2016-02-21 21:54:05 -05:00
appletalk	appletalk: fix erroneous return value	2016-02-18 14:59:34 -05:00
atm
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
bluetooth	Bluetooth: hci_core: Avoid mixing up req_complete and req_complete_skb	2016-02-20 08:52:28 +01:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
caif	net: caif: fix erroneous return value	2016-02-18 14:59:35 -05:00
can
ceph
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
dcb
dccp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
decnet
dns_resolver
dsa	net: dsa: Unregister slave_dev in error path	2016-02-17 22:05:16 -05:00
ethernet
hsr
ieee802154
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
ipx
irda
iucv
key
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
l3mdev
lapb
llc	af_llc: fix types on llc_ui_wait_for_conn	2016-02-17 16:12:13 -05:00
mac80211
mac802154
mpls	mpls: autoload lwt module	2016-02-21 22:00:28 -05:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
netlabel
netlink	nfnetlink: Revert "nfnetlink: add support for memory mapped netlink"	2016-02-18 11:42:22 -05:00
netrom
nfc
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
packet
phonet
rds
rfkill
rose
rxrpc
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
sunrpc
switchdev
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
vmw_vsock
wimax
wireless
x25
xfrm
compat.c
Kconfig	net: add dst_cache support	2016-02-16 20:21:48 -05:00
Makefile
socket.c
sysctl_net.c