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

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

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

2013-10-23 16:49:34 -04:00

..

associola.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-16 15:37:26 -07:00

auth.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

bind_addr.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

chunk.c

net: sctp: Fix data chunk fragmentation for MTU values which are not multiple of 4

2013-09-04 13:20:27 -04:00

command.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

debug.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

endpointola.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

input.c

net: sctp: rfc4443: do not report ICMP redirects to user space

2013-09-16 21:40:15 -04:00

inqueue.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

ipv6.c

ipv6: make lookups simpler and faster

2013-10-09 00:01:25 -04:00

Kconfig

net: sctp: get rid of SCTP_DBG_TSNS entirely

2013-07-02 00:08:03 -07:00

Makefile

sctp: implement sctp association probing module

2010-04-30 22:41:09 -04:00

objcnt.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

output.c

sctp: Perform software checksum if packet has to be fragmented.

2013-10-17 15:24:44 -04:00

outqueue.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

primitive.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

probe.c

net: sctp: probe: allow more advanced ingress filtering by mark

2013-09-03 21:44:11 -04:00

proc.c

net: proc_fs: trivial: print UIDs as unsigned int

2013-08-15 14:37:46 -07:00

protocol.c

Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl"

2013-08-09 13:09:41 -07:00

sm_make_chunk.c

net: sctp: sctp_verify_init: clean up mandatory checks and add comment

2013-08-29 15:54:48 -04:00

sm_sideeffect.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

sm_statefuns.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

sm_statetable.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

socket.c

net ipv4: Convert ipv4.ip_local_port_range to be per netns v3

2013-09-30 21:59:38 -07:00

ssnmap.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

sysctl.c

Revert "net: sctp: convert sctp_checksum_disable module param into sctp sysctl"

2013-08-09 13:09:41 -07:00

transport.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-08-16 15:37:26 -07:00

tsnmap.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

ulpevent.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00

ulpqueue.c

net: sctp: trivial: update bug report in header comment

2013-08-09 11:33:02 -07:00