Merge ../linux-2.6/

2026-09-14 18:22:56 +00:00 · 2005-07-30 14:37:43 +10:00 · 2005-07-30 14:37:43 +10:00 · bdf242eeb0
commit bdf242eeb0
parent 836cf0465c b0825488a6
2021 changed files with 205517 additions and 119972 deletions
--- a/6
+++ b/6
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/acpi-hotkey.txt
+++ b/Documentation/acpi-hotkey.txt
--- a/Documentation/dontdiff
+++ b/Documentation/dontdiff
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/inotify.txt
+++ b/Documentation/filesystems/inotify.txt
--- a/Documentation/filesystems/ntfs.txt
+++ b/Documentation/filesystems/ntfs.txt
--- a/Documentation/i2c/chips/adm1021
+++ b/Documentation/i2c/chips/adm1021
--- a/Documentation/i2c/chips/adm1025
+++ b/Documentation/i2c/chips/adm1025
--- a/Documentation/i2c/chips/adm1026
+++ b/Documentation/i2c/chips/adm1026
--- a/Documentation/i2c/chips/adm1031
+++ b/Documentation/i2c/chips/adm1031
--- a/Documentation/i2c/chips/adm9240
+++ b/Documentation/i2c/chips/adm9240
--- a/Documentation/i2c/chips/asb100
+++ b/Documentation/i2c/chips/asb100
--- a/Documentation/i2c/chips/ds1621
+++ b/Documentation/i2c/chips/ds1621
--- a/Documentation/i2c/chips/fscher
+++ b/Documentation/i2c/chips/fscher
--- a/Documentation/i2c/chips/gl518sm
+++ b/Documentation/i2c/chips/gl518sm
--- a/Documentation/i2c/chips/it87
+++ b/Documentation/i2c/chips/it87
--- a/Documentation/i2c/chips/lm63
+++ b/Documentation/i2c/chips/lm63
--- a/Documentation/i2c/chips/lm75
+++ b/Documentation/i2c/chips/lm75
--- a/Documentation/i2c/chips/lm77
+++ b/Documentation/i2c/chips/lm77
--- a/Documentation/i2c/chips/lm78
+++ b/Documentation/i2c/chips/lm78
--- a/Documentation/i2c/chips/lm80
+++ b/Documentation/i2c/chips/lm80
--- a/Documentation/i2c/chips/lm83
+++ b/Documentation/i2c/chips/lm83
--- a/Documentation/i2c/chips/lm85
+++ b/Documentation/i2c/chips/lm85
--- a/Documentation/i2c/chips/lm87
+++ b/Documentation/i2c/chips/lm87
--- a/Documentation/i2c/chips/lm90
+++ b/Documentation/i2c/chips/lm90
--- a/Documentation/i2c/chips/lm92
+++ b/Documentation/i2c/chips/lm92
--- a/Documentation/i2c/chips/max1619
+++ b/Documentation/i2c/chips/max1619
--- a/Documentation/i2c/chips/pc87360
+++ b/Documentation/i2c/chips/pc87360
--- a/Documentation/i2c/chips/sis5595
+++ b/Documentation/i2c/chips/sis5595
--- a/Documentation/i2c/chips/smsc47b397
+++ b/Documentation/i2c/chips/smsc47b397
--- a/Documentation/i2c/chips/smsc47m1
+++ b/Documentation/i2c/chips/smsc47m1
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
--- a/Documentation/hwmon/userspace-tools
+++ b/Documentation/hwmon/userspace-tools
--- a/Documentation/i2c/chips/via686a
+++ b/Documentation/i2c/chips/via686a
--- a/Documentation/i2c/chips/w83627hf
+++ b/Documentation/i2c/chips/w83627hf
--- a/Documentation/i2c/chips/w83781d
+++ b/Documentation/i2c/chips/w83781d
--- a/Documentation/i2c/chips/w83l785ts
+++ b/Documentation/i2c/chips/w83l785ts
--- a/Documentation/i2c/chips/max6875
+++ b/Documentation/i2c/chips/max6875
--- a/Documentation/i2c/dev-interface
+++ b/Documentation/i2c/dev-interface
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
--- a/Documentation/infiniband/core_locking.txt
+++ b/Documentation/infiniband/core_locking.txt
--- a/Documentation/infiniband/user_mad.txt
+++ b/Documentation/infiniband/user_mad.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/stable_api_nonsense.txt
+++ b/Documentation/stable_api_nonsense.txt
--- a/Documentation/stable_kernel_rules.txt
+++ b/Documentation/stable_kernel_rules.txt
--- a/Documentation/usb/sn9c102.txt
+++ b/Documentation/usb/sn9c102.txt
--- a/Documentation/usb/usbmon.txt
+++ b/Documentation/usb/usbmon.txt
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
--- a/Documentation/video4linux/bttv/Cards
+++ b/Documentation/video4linux/bttv/Cards
--- a/Documentation/video4linux/not-in-cx2388x-datasheet.txt
+++ b/Documentation/video4linux/not-in-cx2388x-datasheet.txt
--- a/Documentation/x86_64/boot-options.txt
+++ b/Documentation/x86_64/boot-options.txt
--- a/23
+++ b/23
--- a/2
+++ b/2
--- a/10
+++ b/10
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- 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/enp2611_defconfig
+++ b/arch/arm/configs/enp2611_defconfig
--- a/arch/arm/configs/ixdp2400_defconfig
+++ b/arch/arm/configs/ixdp2400_defconfig
--- a/arch/arm/configs/ixdp2401_defconfig
+++ b/arch/arm/configs/ixdp2401_defconfig
--- a/arch/arm/configs/ixdp2800_defconfig
+++ b/arch/arm/configs/ixdp2800_defconfig
--- a/arch/arm/configs/ixdp2801_defconfig
+++ b/arch/arm/configs/ixdp2801_defconfig
--- a/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
--- a/arch/arm/configs/shark_defconfig
+++ b/arch/arm/configs/shark_defconfig
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
--- a/arch/arm/lib/io-shark.c
+++ b/arch/arm/lib/io-shark.c
--- a/arch/arm/mach-integrator/platsmp.c
+++ b/arch/arm/mach-integrator/platsmp.c
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
--- a/arch/arm/mach-omap/Makefile
+++ b/arch/arm/mach-omap/Makefile
--- a/arch/arm/mach-omap/common.c
+++ b/arch/arm/mach-omap/common.c
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
--- a/arch/arm/mach-omap1/Makefile.boot
+++ b/arch/arm/mach-omap1/Makefile.boot
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
--- a/arch/arm/mach-omap1/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
--- a/Show more
+++ b/Show more