Merge branch 'upstream'

2026-09-18 18:15:59 +00:00 · 2006-02-11 18:02:04 -05:00 · 2006-02-11 18:02:04 -05:00 · 1cb9d721d9
commit 1cb9d721d9
parent ca7d5e42d7 bef4a456b8
65 changed files with 689 additions and 788 deletions
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
--- a/arch/arm/mach-s3c2410/s3c2400.h
+++ b/arch/arm/mach-s3c2410/s3c2400.h
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/ia64/ia32/ia32_signal.c
+++ b/arch/ia64/ia32/ia32_signal.c
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
--- a/arch/sparc64/kernel/systbls.S
+++ b/arch/sparc64/kernel/systbls.S
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
--- a/include/asm-arm/arch-s3c2410/h1940-latch.h
+++ b/include/asm-arm/arch-s3c2410/h1940-latch.h
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
--- a/include/asm-powerpc/unistd.h
+++ b/include/asm-powerpc/unistd.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/kbd_kern.h
+++ b/include/linux/kbd_kern.h
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/tty_flip.h
+++ b/include/linux/tty_flip.h
--- a/include/net/irda/irlap.h
+++ b/include/net/irda/irlap.h
--- a/init/initramfs.c
+++ b/init/initramfs.c
--- a/init/main.c
+++ b/init/main.c
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
--- a/ipc/shm.c
+++ b/ipc/shm.c
--- a/kernel/panic.c
+++ b/kernel/panic.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/mm/slab.c
+++ b/mm/slab.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/irda/irda_device.c
+++ b/net/irda/irda_device.c
--- a/net/irda/irnet/irnet_irda.c
+++ b/net/irda/irnet/irnet_irda.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile