Merge branch 'upstream'

2026-09-18 18:15:59 +00:00 · 2005-11-20 00:41:18 -05:00 · 2005-11-20 00:41:18 -05:00 · 98a5d024eb
commit 98a5d024eb
parent d67e7ebb2a 1b15688b31
140 changed files with 4843 additions and 4593 deletions
--- a/12
+++ b/12
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
--- a/16
+++ b/16
--- a/2
+++ b/2
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
--- a/arch/arm/mm/blockops.c
+++ b/arch/arm/mm/blockops.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
--- a/arch/parisc/kernel/drivers.c
+++ b/arch/parisc/kernel/drivers.c
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
--- a/arch/parisc/kernel/inventory.c
+++ b/arch/parisc/kernel/inventory.c
--- a/arch/parisc/kernel/ioctl32.c
+++ b/arch/parisc/kernel/ioctl32.c
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
--- a/arch/powerpc/kernel/ptrace-common.h
+++ b/arch/powerpc/kernel/ptrace-common.h
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
--- a/arch/powerpc/mm/imalloc.c
+++ b/arch/powerpc/mm/imalloc.c
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
--- a/block/as-iosched.c
+++ b/block/as-iosched.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/i2c/busses/i2c-ixp2000.c
+++ b/drivers/i2c/busses/i2c-ixp2000.c
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
--- a/drivers/infiniband/ulp/srp/ib_srp.h
+++ b/drivers/infiniband/ulp/srp/ib_srp.h
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
--- a/drivers/isdn/pcbit/Kconfig
+++ b/drivers/isdn/pcbit/Kconfig
--- a/drivers/mtd/maps/ipaq-flash.c
+++ b/drivers/mtd/maps/ipaq-flash.c
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/fec_8xx/Kconfig
+++ b/drivers/net/fec_8xx/Kconfig
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/saa9730.h
+++ b/drivers/net/saa9730.h
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
--- a/drivers/net/wan/hdlc_cisco.c
+++ b/drivers/net/wan/hdlc_cisco.c
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
--- a/drivers/net/wan/hdlc_generic.c
+++ b/drivers/net/wan/hdlc_generic.c
--- a/drivers/net/wireless/hermes.c
+++ b/drivers/net/wireless/hermes.c
--- a/drivers/net/wireless/hermes.h
+++ b/drivers/net/wireless/hermes.h
--- a/drivers/net/wireless/i82593.h
+++ b/drivers/net/wireless/i82593.h
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
--- a/drivers/net/wireless/prism54/isl_38xx.c
+++ b/drivers/net/wireless/prism54/isl_38xx.c
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
--- a/drivers/serial/amba-pl011.c
+++ b/drivers/serial/amba-pl011.c
--- a/drivers/serial/mux.c
+++ b/drivers/serial/mux.c
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
--- a/include/asm-arm/arch-ixp4xx/io.h
+++ b/include/asm-arm/arch-ixp4xx/io.h
--- a/include/asm-arm/hardware/amba_serial.h
+++ b/include/asm-arm/hardware/amba_serial.h
--- a/include/asm-arm/io.h
+++ b/include/asm-arm/io.h
--- a/include/asm-arm/uaccess.h
+++ b/include/asm-arm/uaccess.h
--- a/Show more
+++ b/Show more