David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-03 23:32:12 -07:00
..
9p
802
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
appletalk	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
atm	atm: remove commented out check	2014-05-30 17:17:04 -07:00
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next	2014-05-29 13:03:47 -04:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
caif
can	can: add hash based access to single EFF frame filters	2014-05-19 09:38:24 +02:00
ceph	crush: decode and initialize chooseleaf_vary_r	2014-05-16 21:29:55 +04:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
dcb
dccp	net: Eliminate no_check from protosw	2014-05-23 16:28:53 -04:00
decnet	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
dns_resolver
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
ethernet
hsr
ieee802154	6lowpan_rtnl: fix off by one while fragmentation	2014-06-02 10:39:42 -07:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
ipx	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
irda
iucv	af_iucv: correct cleanup if listen backlog is full	2014-05-30 17:35:23 -07:00
key	af_key: Replace comma with semicolon	2014-05-30 17:48:58 -07:00
l2tp	l2tp: Add support for zero IPv6 checksums	2014-05-23 16:28:53 -04:00
lapb
llc
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-29 12:55:38 -04:00
mac802154	mac802154: llsec: correctly lookup implicit-indexed keys	2014-05-22 15:27:32 -04:00
mpls
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
netlabel
netlink	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
netrom
nfc	NFC: nfc_sock_link() can be static	2014-05-26 00:53:10 +02:00
openvswitch	openvswitch: Simplify genetlink code.	2014-05-22 16:27:37 -07:00
packet
phonet
rds	rds/tcp_listen: Replace comma with semicolon	2014-05-30 17:48:58 -07:00
rfkill	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-22 13:58:36 -04:00
rose
rxrpc	af_rxrpc: Fix XDR length check in rxrpc key demarshalling.	2014-05-16 15:24:47 -04:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-24 00:32:30 -04:00
sctp	net: Split sk_no_check into sk_no_check_{rx,tx}	2014-05-23 16:28:53 -04:00
sunrpc	sunrpc: Remove sk_no_check setting	2014-05-23 16:28:53 -04:00
tipc	tipc: Don't reset the timeout when restarting	2014-05-24 14:11:41 -04:00
unix	net: unix: Align send data_len up to PAGE_SIZE	2014-05-16 16:04:03 -04:00
vmw_vsock
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-05-29 12:55:38 -04:00
x25
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
compat.c
Kconfig
Makefile
nonet.c
socket.c
sysctl_net.c