David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/networking/ip-sysctl.txt
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

Both conflicts were simply overlapping context.

A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-01-15 15:05:59 -05:00

..

conntrack.h

netfilter: xt_CT: fix crash while destroy ct templates

2012-12-16 23:44:12 +01:00

core.h

percpu: add __percpu sparse annotations to net

2010-02-16 23:05:38 -08:00

dccp.h

[NETNS][DCCPV6]: Move the dccp_v6_ctl_sk on the struct net.

2008-04-13 22:32:25 -07:00

generic.h

BUG: headers with BUG/BUG_ON etc. need linux/bug.h

2012-03-04 17:54:34 -05:00

hash.h

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

ipv4.h

tcp: make sysctl_tcp_ecn namespace aware

2013-01-06 21:09:56 -08:00

ipv6.h

ipv6: add a new namespace for nf_conntrack_reasm

2012-09-19 17:23:28 -04:00

mib.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

packet.h

packet: fix broken build.

2012-08-23 09:29:45 -07:00

sctp.h

sctp: Make hmac algorithm selection for cookie generation dynamic

2012-10-26 02:22:18 -04:00

unix.h

[NETNS]: struct net content re-work (v3)

2008-01-28 14:57:14 -08:00

x_tables.h

netfilter: xt_CT: recover NOTRACK target support

2012-12-24 12:55:09 +01:00

xfrm.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00