kernel_optimize_test/net
David S. Miller 4366004d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-24 13:19:00 -04:00
..
9p
802
8021q vlan: unnecessary to check if vlan_pcpu_stats is NULL 2014-04-22 21:27:57 -04:00
appletalk
atm
ax25
batman-adv
bluetooth
bridge
caif
can
ceph
core Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-04-24 13:19:00 -04:00
dcb
dccp ipv4: add a sock pointer to ip_queue_xmit() 2014-04-15 12:58:34 -04:00
decnet ipv4: add a sock pointer to dst->output() path. 2014-04-15 13:47:15 -04:00
dns_resolver
dsa
ethernet
hsr
ieee802154 6lowpan: make lowpan_cb static 2014-04-20 18:18:55 -04:00
ipv4 gre: add x-netns support 2014-04-23 14:53:36 -04:00
ipv6 ip6gre: add x-netns support 2014-04-23 14:53:36 -04:00
ipx
irda
iucv
key
l2tp ipv4: add a sock pointer to ip_queue_xmit() 2014-04-15 12:58:34 -04:00
lapb
llc
mac80211
mac802154
mpls
netfilter netlink: have netlink per-protocol bind function return an error code. 2014-04-22 21:42:26 -04:00
netlabel
netlink netlink: implement unbind to netlink_setsockopt NETLINK_DROP_MEMBERSHIP 2014-04-22 21:42:26 -04:00
netrom
nfc
openvswitch ipv4: add a sock pointer to dst->output() path. 2014-04-15 13:47:15 -04:00
packet net: Fix ns_capable check in sock_diag_put_filterinfo 2014-04-22 12:49:39 -04:00
phonet
rds
rfkill
rose
rxrpc
sched
sctp sctp: add support for busy polling to sctp protocol 2014-04-20 18:18:55 -04:00
sunrpc
tipc tipc: fix race in disc create/delete 2014-04-22 21:17:53 -04:00
unix
vmw_vsock
wimax
wireless
x25
xfrm ipv4: add a sock pointer to dst->output() path. 2014-04-15 13:47:15 -04:00
compat.c
Kconfig
Makefile
nonet.c
socket.c net: use SYSCALL_DEFINEx for sys_recv 2014-04-16 15:15:05 -04:00
sysctl_net.c