David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
associola.c	sctp: fix some comments in chunk.c and associola.c	2013-10-28 01:02:34 -04:00
auth.c	sctp: merge two if statements to one	2013-10-28 01:02:34 -04:00
bind_addr.c	net: sctp: trivial: update bug report in header comment	2013-08-09 11:33:02 -07:00
chunk.c	sctp: fix some comments in chunk.c and associola.c	2013-10-28 01:02:34 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
Kconfig	net: sctp: get rid of SCTP_DBG_TSNS entirely	2013-07-02 00:08:03 -07:00
Makefile
objcnt.c	net: sctp: trivial: update bug report in header comment	2013-08-09 11:33:02 -07:00
output.c	net: sctp: fix and consolidate SCTP checksumming code	2013-11-03 23:04:57 -05: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	sctp: remove the repeat initialize with 0	2013-10-28 01:02:34 -04:00
sm_sideeffect.c	net: sctp: do not trigger BUG_ON in sctp_cmd_delete_tcb	2013-11-04 00:46:44 -05: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