android_kernel_xiaomi_sm8350/net/sctp
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
associola.c
auth.c
bind_addr.c net: remove INIT_RCU_HEAD() usage 2010-02-17 00:03:27 -08:00
chunk.c
command.c
debug.c
endpointola.c
input.c
inqueue.c
ipv6.c net: remove INIT_RCU_HEAD() usage 2010-02-17 00:03:27 -08:00
Kconfig
Makefile
objcnt.c
output.c
outqueue.c
primitive.c
proc.c percpu: add __percpu sparse annotations to net 2010-02-16 23:05:38 -08:00
protocol.c net: remove INIT_RCU_HEAD() usage 2010-02-17 00:03:27 -08:00
sm_make_chunk.c
sm_sideeffect.c tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
sm_statefuns.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
sm_statetable.c
socket.c net/sctp: Eliminate useless code 2010-01-21 02:43:20 -08:00
ssnmap.c
sysctl.c sctp: fix compile error due to sysctl mismerge 2009-12-08 12:51:22 -08:00
transport.c
tsnmap.c
ulpevent.c
ulpqueue.c