Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>
2026-09-16 18:15:52 +00:00 · 2006-01-23 12:51:00 -08:00 · 2006-01-23 12:51:00 -08:00 · 4c8af5254e
commit 4c8af5254e
parent 0820e15a35 3ee68c4af3
45 changed files with 540 additions and 656 deletions
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
--- a/arch/ia64/sn/include/xtalk/hubdev.h
+++ b/arch/ia64/sn/include/xtalk/hubdev.h
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/ia64/sn/kernel/mca.c
+++ b/arch/ia64/sn/kernel/mca.c
--- a/arch/ia64/sn/kernel/xp_main.c
+++ b/arch/ia64/sn/kernel/xp_main.c
--- a/arch/ia64/sn/kernel/xpc_channel.c
+++ b/arch/ia64/sn/kernel/xpc_channel.c
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
--- a/arch/sparc/kernel/rtrap.S
+++ b/arch/sparc/kernel/rtrap.S
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
--- a/arch/sparc64/kernel/rtrap.S
+++ b/arch/sparc64/kernel/rtrap.S
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
--- a/arch/sparc64/solaris/entry64.S
+++ b/arch/sparc64/solaris/entry64.S
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
--- a/fs/compat.c
+++ b/fs/compat.c
--- a/include/asm-ia64/semaphore.h
+++ b/include/asm-ia64/semaphore.h
--- a/include/asm-ia64/sn/xp.h
+++ b/include/asm-ia64/sn/xp.h
--- a/include/asm-ia64/sn/xpc.h
+++ b/include/asm-ia64/sn/xpc.h
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
--- a/include/asm-sparc/oplib.h
+++ b/include/asm-sparc/oplib.h
--- a/include/asm-sparc/thread_info.h
+++ b/include/asm-sparc/thread_info.h
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
--- a/include/asm-sparc64/thread_info.h
+++ b/include/asm-sparc64/thread_info.h
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
--- a/net/sctp/inqueue.c
+++ b/net/sctp/inqueue.c
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
--- a/net/sctp/sysctl.c
+++ b/net/sctp/sysctl.c
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c