Auto merge with /home/aegl/GIT/linus

2026-09-24 18:16:04 +00:00 · 2005-07-25 15:46:44 -07:00 · 2005-07-25 15:46:44 -07:00 · 05cb784c81
commit 05cb784c81
parent 3190186362 6b6a93c687
102 changed files with 960 additions and 1220 deletions
--- a/arch/arm/boot/compressed/head-shark.S
+++ b/arch/arm/boot/compressed/head-shark.S
--- a/arch/arm/configs/bast_defconfig
+++ b/arch/arm/configs/bast_defconfig
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/nwfpe/fpa11.h
+++ b/arch/arm/nwfpe/fpa11.h
--- a/arch/arm/nwfpe/fpmodule.c
+++ b/arch/arm/nwfpe/fpmodule.c
--- a/arch/arm/nwfpe/fpmodule.inl
+++ b/arch/arm/nwfpe/fpmodule.inl
--- a/arch/i386/kernel/i387.c
+++ b/arch/i386/kernel/i387.c
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
--- a/crypto/internal.h
+++ b/crypto/internal.h
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
--- a/drivers/atm/zatm.h
+++ b/drivers/atm/zatm.h
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
--- a/drivers/net/wan/sdla_fr.c
+++ b/drivers/net/wan/sdla_fr.c
--- a/drivers/net/wan/sdla_ft1.c
+++ b/drivers/net/wan/sdla_ft1.c
--- a/drivers/net/wan/sdla_ppp.c
+++ b/drivers/net/wan/sdla_ppp.c
--- a/drivers/net/wan/sdla_x25.c
+++ b/drivers/net/wan/sdla_x25.c
--- a/drivers/net/wan/wanpipe_multppp.c
+++ b/drivers/net/wan/wanpipe_multppp.c
--- a/drivers/sbus/char/Kconfig
+++ b/drivers/sbus/char/Kconfig
--- a/drivers/sbus/char/aurora.c
+++ b/drivers/sbus/char/aurora.c
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
--- a/drivers/sbus/char/vfc_i2c.c
+++ b/drivers/sbus/char/vfc_i2c.c
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
--- a/drivers/serial/bast_sio.c
+++ b/drivers/serial/bast_sio.c
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
--- a/drivers/video/imxfb.h
+++ b/drivers/video/imxfb.h
--- a/drivers/w1/w1_int.c
+++ b/drivers/w1/w1_int.c
--- a/include/asm-arm/arch-imx/imxfb.h
+++ b/include/asm-arm/arch-imx/imxfb.h
--- a/include/asm-arm/locks.h
+++ b/include/asm-arm/locks.h
--- a/include/asm-arm/spinlock.h
+++ b/include/asm-arm/spinlock.h
--- a/include/asm-i386/i387.h
+++ b/include/asm-i386/i387.h
--- a/include/asm-sparc64/bitops.h
+++ b/include/asm-sparc64/bitops.h
--- a/include/asm-sparc64/ptrace.h
+++ b/include/asm-sparc64/ptrace.h
--- a/include/asm-sparc64/rwsem.h
+++ b/include/asm-sparc64/rwsem.h
--- a/include/asm-sparc64/spitfire.h
+++ b/include/asm-sparc64/spitfire.h
--- a/include/asm-sparc64/system.h
+++ b/include/asm-sparc64/system.h
--- a/include/asm-sparc64/thread_info.h
+++ b/include/asm-sparc64/thread_info.h
--- a/include/asm-sparc64/timer.h
+++ b/include/asm-sparc64/timer.h
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/net/Kconfig
+++ b/net/Kconfig
--- a/net/atm/Kconfig
+++ b/net/atm/Kconfig
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
--- a/net/core/Makefile
+++ b/net/core/Makefile
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
--- a/net/ipv4/netfilter/ip_conntrack_amanda.c
+++ b/net/ipv4/netfilter/ip_conntrack_amanda.c
--- a/net/ipv4/netfilter/ip_conntrack_core.c
+++ b/net/ipv4/netfilter/ip_conntrack_core.c
--- a/net/ipv4/netfilter/ip_conntrack_ftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_ftp.c
--- a/net/ipv4/netfilter/ip_conntrack_irc.c
+++ b/net/ipv4/netfilter/ip_conntrack_irc.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_conntrack_tftp.c
+++ b/net/ipv4/netfilter/ip_conntrack_tftp.c
--- a/net/ipv4/netfilter/ip_nat_amanda.c
+++ b/net/ipv4/netfilter/ip_nat_amanda.c
--- a/net/ipv4/netfilter/ip_nat_ftp.c
+++ b/net/ipv4/netfilter/ip_nat_ftp.c
--- a/net/ipv4/netfilter/ip_nat_irc.c
+++ b/net/ipv4/netfilter/ip_nat_irc.c
--- a/net/ipv4/netfilter/ip_nat_proto_icmp.c
+++ b/net/ipv4/netfilter/ip_nat_proto_icmp.c
--- a/net/ipv4/netfilter/ip_nat_proto_tcp.c
+++ b/net/ipv4/netfilter/ip_nat_proto_tcp.c
--- a/net/ipv4/netfilter/ip_nat_proto_udp.c
+++ b/net/ipv4/netfilter/ip_nat_proto_udp.c
--- a/net/ipv4/netfilter/ip_nat_tftp.c
+++ b/net/ipv4/netfilter/ip_nat_tftp.c
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
--- a/net/ipv6/netfilter/ip6_queue.c
+++ b/net/ipv6/netfilter/ip6_queue.c
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
--- a/net/sched/em_text.c
+++ b/net/sched/em_text.c
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
--- a/Show more
+++ b/Show more