David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... In netdevice.h we removed the structure in net-next that is being changes in 'net'. In macsec.c and rtnetlink.c we have overlaps between fixes in 'net' and the u64 attribute changes in 'net-next'. The mlx5 conflicts have to do with vxlan support dependencies. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-09 15:59:24 -04:00
..
6lowpan
9p
802
8021q
appletalk
atm	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
ax25
batman-adv	In this pull request you have:	2016-05-04 16:21:08 -04:00
bluetooth	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
caif
can
ceph	libceph: make authorizer destruction independent of ceph_auth_client	2016-04-25 20:54:13 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
dcb
dccp	dccp: do not assume DCCP code is non preemptible	2016-05-02 17:02:25 -04:00
decnet
dns_resolver
dsa	net: dsa: Provide CPU port statistics to master netdev	2016-04-28 17:16:17 -04:00
ethernet
hsr	NLA_BINARY misuse bug in HSR	2016-04-21 13:59:08 -04:00
ieee802154	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2016-04-26 13:15:56 -04:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
ipx
irda	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
iucv
kcm
key
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
l3mdev
lapb
llc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
mac802154
mpls
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-05-09 15:02:58 -04:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
netrom
nfc
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-05-09 15:02:58 -04:00
packet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
phonet
qrtr	net: Add Qualcomm IPC router	2016-05-08 23:46:14 -04:00
rds	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
rfkill
rose
rxrpc	net: udp: rename UDP_INC_STATS_BH()	2016-04-27 22:48:23 -04:00
sched	fq_codel: add memory limitation per queue	2016-05-08 23:49:38 -04:00
sctp	sctp: prepare for socket backlog behavior change	2016-05-02 17:02:26 -04:00
sunrpc	net: udp: rename UDP_INC_STATS_BH()	2016-04-27 22:48:23 -04:00
switchdev	switchdev: Adding complete operation to deferred switchdev ops	2016-04-24 14:23:32 -04:00
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
unix
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
wimax
wireless	wireless: use nla_put_u64_64bit()	2016-04-25 15:09:11 -04:00
x25
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
compat.c
Kconfig	net: Add Qualcomm IPC router	2016-05-08 23:46:14 -04:00
Makefile	net: Add Qualcomm IPC router	2016-05-08 23:46:14 -04:00
socket.c	tcp: remove SKBTX_ACK_TSTAMP since it is redundant	2016-04-28 16:06:10 -04:00
sysctl_net.c