David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

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

2014-01-06 17:37:45 -05:00

..

ccids

dccp: make local variable static

2014-01-04 20:18:50 -05:00

ackvec.c

…

ackvec.h

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

ccid.c

…

ccid.h

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

dccp.h

dccp: remove obsolete code

2014-01-04 20:18:49 -05:00

diag.c

…

feat.c

…

feat.h

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

input.c

…

ipv4.c

net: Remove FLOWI_FLAG_CAN_SLEEP

2013-12-06 07:24:39 +01:00

ipv6.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

2013-12-19 18:37:49 -05:00

ipv6.h

inet: includes a sock_common in request_sock

2013-10-10 00:08:07 -04:00

Kconfig

net/dccp: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:39:34 -08:00

Makefile

…

minisocks.c

inet: rename ir_loc_port to ir_num

2013-10-10 14:37:35 -04:00

options.c

dccp: remove obsolete code

2014-01-04 20:18:49 -05:00

output.c

inet: rename ir_loc_port to ir_num

2013-10-10 14:37:35 -04:00

probe.c

dccp: catch failed request_module call in dccp_probe init

2013-12-19 19:25:50 -05:00

proto.c

tcp/dccp: remove twchain

2013-10-08 23:19:24 -04:00

qpolicy.c

…

sysctl.c

…

timer.c

…