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

Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

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

2014-02-19 01:24:22 -05:00

..

associola.c

net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer

2014-02-17 00:16:56 -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: remove macros sctp_local_bh_{disable|enable}

2014-01-21 18:40:40 -08:00

input.c

sctp: remove macros sctp_bh_[un]lock_sock

2014-01-21 18:41:36 -08:00

inqueue.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ipv6.c

net: sctp: fix initialization of local source address on accepted ipv6 sockets

2014-02-06 21:18:06 -08: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

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: remove macros sctp_local_bh_{disable|enable}

2014-01-21 18:40:40 -08:00

protocol.c

sctp: remove macros sctp_bh_[un]lock_sock

2014-01-21 18:41:36 -08:00

sm_make_chunk.c

sctp: make sctp_addto_chunk_fixed local

2014-01-13 14:42:30 -08:00

sm_sideeffect.c

sctp: remove macros sctp_bh_[un]lock_sock

2014-01-21 18:41:36 -08:00

sm_statefuns.c

net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer

2014-02-17 00:16:56 -05:00

sm_statetable.c

sctp: fix checkpatch errors with indent

2013-12-26 13:47:48 -05:00

socket.c

net: sctp: fix sctp_connectx abi for ia32 emulation/compat mode

2014-02-18 16:06:48 -05:00

ssnmap.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

sysctl.c

sctp: optimize the sctp_sysctl_net_register

2014-02-13 17:08:29 -05:00

transport.c

net: remove unnecessary return's

2014-02-13 18:33:38 -05:00

tsnmap.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ulpevent.c

net: sctp: Fix a_rwnd/rwnd management to reflect real state of the receiver's buffer

2014-02-17 00:16:56 -05:00

ulpqueue.c

sctp: fix checkpatch errors with open brace '{' and trailing statements

2013-12-26 13:47:48 -05:00