David S. Miller e548833df8 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

associola.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

auth.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

bind_addr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

chunk.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

command.c

[SCTP]: Remove sctp_add_cmd_sf wrapper bloat

2008-03-27 17:54:29 -07:00

debug.c

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

endpointola.c

Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev

2010-05-03 16:24:31 -07:00

input.c

sctp: Fix a race between ICMP protocol unreachable and connect()

2010-05-06 00:56:07 -07:00

inqueue.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

ipv6.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

Kconfig

sctp: implement sctp association probing module

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

Makefile

sctp: implement sctp association probing module

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

objcnt.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

output.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

outqueue.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

primitive.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

probe.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

proc.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00

protocol.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

sm_make_chunk.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

sm_sideeffect.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

sm_statefuns.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2010-09-09 22:27:33 -07:00

sm_statetable.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

socket.c

sctp: implement SIOCINQ ioctl() (take 3)

2010-09-08 13:08:05 -07:00

ssnmap.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

sysctl.c

sctp: fix compile error due to sysctl mismerge

2009-12-08 12:51:22 -08:00

transport.c

net/sctp: Use pr_fmt and pr_<level>

2010-08-26 14:11:48 -07:00

tsnmap.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ulpevent.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ulpqueue.c

net: Remove unnecessary returns from void function()s

2010-05-17 23:23:14 -07:00