David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -04:00
..
9p
802
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
appletalk
atm	atm: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
ax25
batman-adv	batman-adv: Start new development cycle	2014-03-22 09:18:59 +01:00
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-03-21 14:02:04 -04:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
caif
can	can: remove CAN FD compatibility for CAN 2.0 sockets	2014-03-03 14:29:52 +01:00
ceph
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
dcb
dccp
decnet
dns_resolver
dsa
ethernet
hsr	hsr: replace del_timer by del_timer_sync	2014-03-27 15:28:06 -04:00
ieee802154	ieee802154: dgram: cleanup set of broadcast panid	2014-03-20 17:19:45 -04:00
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
ipx
irda
iucv	af_iucv: recvmsg problem for SOCK_STREAM sockets	2014-03-20 00:06:55 -04:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
l2tp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
lapb
llc
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-03-21 14:02:04 -04:00
mac802154	ieee802154: add proper length checks to header creations	2014-03-14 22:15:26 -04:00
mpls
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
netlabel
netlink	netlink: autosize skb lengthes	2014-03-10 13:56:26 -04:00
netrom
nfc	NFC: 3.15: First pull request	2014-03-17 13:16:50 -04:00
openvswitch	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
packet	packet: respect devices with LLTX flag in direct xmit	2014-03-28 16:49:48 -04:00
phonet
rds
rfkill
rose
rxrpc	af_rxrpc: Keep rxrpc_call pointers in a hashtable	2014-03-04 10:36:53 +00:00
sched	net: sched: use no more than one page in struct fw_head	2014-03-18 14:17:55 -04:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
sunrpc
tipc	tipc: make discovery domain a bearer attribute	2014-03-28 14:46:29 -04:00
unix	net: unix: non blocking recvmsg() should not return -EINTR	2014-03-26 17:05:40 -04:00
vmw_vsock
wimax
wireless	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-03-21 14:02:04 -04:00
x25
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
compat.c
Kconfig
Makefile
nonet.c
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
sysctl_net.c