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
..
associola.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
auth.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00
bind_addr.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
chunk.c	sctp: fix checkpatch errors with space required or prohibited	2013-12-26 13:47:47 -05:00
command.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
debug.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
endpointola.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
input.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00
inqueue.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ipv6.c	sctp: fix checkpatch errors with space required or prohibited	2013-12-26 13:47:47 -05:00
Kconfig
Makefile
objcnt.c	sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar	2013-12-26 13:47:47 -05:00
output.c	sctp: move skb_dst_set() a bit downwards in sctp_packet_transmit()	2013-12-31 14:31:44 -05:00
outqueue.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
primitive.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
probe.c	sctp: loading sctp when load sctp_probe	2013-12-16 20:04:27 -05:00
proc.c	sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar	2013-12-26 13:47:47 -05:00
protocol.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00
sm_make_chunk.c	sctp: fix checkpatch errors with indent	2013-12-26 13:47:48 -05:00
sm_sideeffect.c	sctp: fix checkpatch errors with space required or prohibited	2013-12-26 13:47:47 -05:00
sm_statefuns.c	sctp: fix checkpatch errors with indent	2013-12-26 13:47:48 -05:00
sm_statetable.c	sctp: fix checkpatch errors with indent	2013-12-26 13:47:48 -05:00
socket.c	sctp: Add process name and pid to deprecation warnings	2014-01-03 19:36:46 -05:00
ssnmap.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
sysctl.c	sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar	2013-12-26 13:47:47 -05:00
transport.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-09 20:20:14 -05:00
tsnmap.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpevent.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpqueue.c	sctp: fix checkpatch errors with open brace '{' and trailing statements	2013-12-26 13:47:48 -05:00