Merge branch 'upstream'

Conflicts: drivers/scsi/sata_vsc.c
2026-09-16 18:15:52 +00:00 · 2006-03-24 09:24:04 -05:00 · 2006-03-24 09:24:04 -05:00 · 11ed56fb78
commit 11ed56fb78
parent 54da9a3968 2cc432eed0
2024 changed files with 128192 additions and 98617 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/3
+++ b/3
--- a/Documentation/BUG-HUNTING
+++ b/Documentation/BUG-HUNTING
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/sis900.tmpl
+++ b/Documentation/DocBook/sis900.tmpl
--- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
--- a/Documentation/connector/connector.txt
+++ b/Documentation/connector/connector.txt
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/dvb/avermedia.txt
+++ b/Documentation/dvb/avermedia.txt
--- a/Documentation/dvb/bt8xx.txt
+++ b/Documentation/dvb/bt8xx.txt
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
--- a/Documentation/dvb/readme.txt
+++ b/Documentation/dvb/readme.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/isofs.txt
+++ b/Documentation/filesystems/isofs.txt
--- a/Documentation/filesystems/jfs.txt
+++ b/Documentation/filesystems/jfs.txt
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
--- a/Documentation/networking/README.ipw2100
+++ b/Documentation/networking/README.ipw2100
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
--- a/Documentation/networking/e100.txt
+++ b/Documentation/networking/e100.txt
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
--- a/Documentation/networking/sis900.txt
+++ b/Documentation/networking/sis900.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sound/alsa/Audiophile-Usb.txt
+++ b/Documentation/sound/alsa/Audiophile-Usb.txt
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
--- a/Documentation/spinlocks.txt
+++ b/Documentation/spinlocks.txt
--- a/Documentation/usb/et61x251.txt
+++ b/Documentation/usb/et61x251.txt
--- a/Documentation/usb/sn9c102.txt
+++ b/Documentation/usb/sn9c102.txt
--- a/Documentation/usb/zc0301.txt
+++ b/Documentation/usb/zc0301.txt
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
--- a/Documentation/video4linux/README.cpia2
+++ b/Documentation/video4linux/README.cpia2
--- a/Documentation/video4linux/cpia2_overview.txt
+++ b/Documentation/video4linux/cpia2_overview.txt
--- a/Documentation/vm/page_migration
+++ b/Documentation/vm/page_migration
--- a/35
+++ b/35
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
--- a/arch/arm/mach-ixp2000/uengine.c
+++ b/arch/arm/mach-ixp2000/uengine.c
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/configs/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
--- a/arch/arm/configs/ixdp2401_defconfig
+++ b/arch/arm/configs/ixdp2401_defconfig
--- a/arch/arm/configs/ixdp2801_defconfig
+++ b/arch/arm/configs/ixdp2801_defconfig
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
--- a/arch/arm/kernel/compat.c
+++ b/arch/arm/kernel/compat.c
--- a/include/asm-arm/arch-pxa/irq.h
+++ b/include/asm-arm/arch-pxa/irq.h
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/lib/delay.S
+++ b/arch/arm/lib/delay.S
--- a/arch/arm/lib/io-acorn.S
+++ b/arch/arm/lib/io-acorn.S
--- a/arch/arm/lib/muldi3.S
+++ b/arch/arm/lib/muldi3.S
--- a/arch/arm/mach-at91rm9200/clock.c
+++ b/arch/arm/mach-at91rm9200/clock.c
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
--- a/arch/arm/mach-at91rm9200/time.c
+++ b/arch/arm/mach-at91rm9200/time.c
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
--- a/arch/arm/mach-ep93xx/Makefile
+++ b/arch/arm/mach-ep93xx/Makefile
--- a/arch/arm/mach-ep93xx/Makefile.boot
+++ b/arch/arm/mach-ep93xx/Makefile.boot
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
--- a/arch/arm/mach-footbridge/dc21285.c
+++ b/arch/arm/mach-footbridge/dc21285.c
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
--- a/arch/arm/mach-iop3xx/iq31244-pci.c
+++ b/arch/arm/mach-iop3xx/iq31244-pci.c
--- a/arch/arm/mach-iop3xx/iq80321-pci.c
+++ b/arch/arm/mach-iop3xx/iq80321-pci.c
--- a/arch/arm/mach-iop3xx/iq80331-pci.c
+++ b/arch/arm/mach-iop3xx/iq80331-pci.c
--- a/arch/arm/mach-iop3xx/iq80332-pci.c
+++ b/arch/arm/mach-iop3xx/iq80332-pci.c
--- a/arch/arm/mach-ixp2000/Kconfig
+++ b/arch/arm/mach-ixp2000/Kconfig
--- a/arch/arm/mach-ixp2000/Makefile
+++ b/arch/arm/mach-ixp2000/Makefile
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
--- a/arch/arm/mach-lh7a40x/common.h
+++ b/arch/arm/mach-lh7a40x/common.h
--- a/arch/arm/mach-lh7a40x/irq-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-kev7a400.c
--- a/arch/arm/mach-lh7a40x/irq-lh7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c
--- a/Show more
+++ b/Show more