Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2026-09-16 18:15:52 +00:00 · 2005-08-30 11:33:26 -07:00 · 2005-08-30 11:33:26 -07:00 · 2016ef789a
commit 2016ef789a
parent 7f57356b70 6b39374a27
1089 changed files with 67810 additions and 26168 deletions
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/networking/cxgb.txt
+++ b/Documentation/networking/cxgb.txt
--- a/Documentation/networking/phy.txt
+++ b/Documentation/networking/phy.txt
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
--- a/6
+++ b/6
--- a/4
+++ b/4
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
--- a/arch/arm/mach-sa1100/cerf.c
+++ b/arch/arm/mach-sa1100/cerf.c
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
--- a/arch/arm/mach-sa1100/generic.h
+++ b/arch/arm/mach-sa1100/generic.h
--- a/arch/arm/mach-sa1100/lart.c
+++ b/arch/arm/mach-sa1100/lart.c
--- a/arch/arm/mach-sa1100/shannon.c
+++ b/arch/arm/mach-sa1100/shannon.c
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
--- a/arch/arm26/kernel/signal.c
+++ b/arch/arm26/kernel/signal.c
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
--- a/arch/m32r/kernel/signal.c
+++ b/arch/m32r/kernel/signal.c
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
--- a/arch/ppc/boot/utils/addRamDisk.c
+++ b/arch/ppc/boot/utils/addRamDisk.c
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
--- a/arch/ppc64/boot/Makefile
+++ b/arch/ppc64/boot/Makefile
--- a/arch/ppc64/boot/addnote.c
+++ b/arch/ppc64/boot/addnote.c
--- a/arch/ppc64/boot/crt0.S
+++ b/arch/ppc64/boot/crt0.S
--- a/arch/ppc64/boot/div64.S
+++ b/arch/ppc64/boot/div64.S
--- a/arch/ppc64/boot/elf.h
+++ b/arch/ppc64/boot/elf.h
--- a/arch/ppc64/boot/main.c
+++ b/arch/ppc64/boot/main.c
--- a/arch/ppc64/boot/page.h
+++ b/arch/ppc64/boot/page.h
--- a/arch/ppc64/boot/ppc32-types.h
+++ b/arch/ppc64/boot/ppc32-types.h
--- a/arch/ppc64/boot/ppc_asm.h
+++ b/arch/ppc64/boot/ppc_asm.h
--- a/arch/ppc64/boot/prom.c
+++ b/arch/ppc64/boot/prom.c
--- a/arch/ppc64/boot/prom.h
+++ b/arch/ppc64/boot/prom.h
--- a/arch/ppc64/boot/stdio.h
+++ b/arch/ppc64/boot/stdio.h
--- a/arch/ppc64/boot/string.S
+++ b/arch/ppc64/boot/string.S
--- a/arch/ppc64/boot/string.h
+++ b/arch/ppc64/boot/string.h
--- a/arch/ppc64/boot/zlib.c
+++ b/arch/ppc64/boot/zlib.c
--- a/arch/ppc64/configs/g5_defconfig
+++ b/arch/ppc64/configs/g5_defconfig
--- a/arch/ppc64/configs/iSeries_defconfig
+++ b/arch/ppc64/configs/iSeries_defconfig
--- a/arch/ppc64/configs/maple_defconfig
+++ b/arch/ppc64/configs/maple_defconfig
--- a/arch/ppc64/configs/pSeries_defconfig
+++ b/arch/ppc64/configs/pSeries_defconfig
--- a/arch/ppc64/defconfig
+++ b/arch/ppc64/defconfig
--- a/arch/ppc64/kernel/LparData.c
+++ b/arch/ppc64/kernel/LparData.c
--- a/arch/ppc64/kernel/Makefile
+++ b/arch/ppc64/kernel/Makefile
--- a/arch/ppc64/kernel/asm-offsets.c
+++ b/arch/ppc64/kernel/asm-offsets.c
--- a/arch/ppc64/kernel/cputable.c
+++ b/arch/ppc64/kernel/cputable.c
--- a/arch/ppc64/kernel/firmware.c
+++ b/arch/ppc64/kernel/firmware.c
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/iSeries_htab.c
+++ b/arch/ppc64/kernel/iSeries_htab.c
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
--- a/arch/ppc64/kernel/iSeries_vio.c
+++ b/arch/ppc64/kernel/iSeries_vio.c
--- a/arch/ppc64/kernel/lmb.c
+++ b/arch/ppc64/kernel/lmb.c
--- a/arch/ppc64/kernel/lparcfg.c
+++ b/arch/ppc64/kernel/lparcfg.c
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
--- a/arch/ppc64/kernel/of_device.c
+++ b/arch/ppc64/kernel/of_device.c
--- a/arch/ppc64/kernel/pSeries_iommu.c
+++ b/arch/ppc64/kernel/pSeries_iommu.c
--- a/arch/ppc64/kernel/pSeries_lpar.c
+++ b/arch/ppc64/kernel/pSeries_lpar.c
--- a/arch/ppc64/kernel/pSeries_setup.c
+++ b/arch/ppc64/kernel/pSeries_setup.c
--- a/arch/ppc64/kernel/pSeries_smp.c
+++ b/arch/ppc64/kernel/pSeries_smp.c
--- a/arch/ppc64/kernel/pSeries_vio.c
+++ b/arch/ppc64/kernel/pSeries_vio.c
--- a/arch/ppc64/kernel/pacaData.c
+++ b/arch/ppc64/kernel/pacaData.c
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
--- a/arch/ppc64/kernel/pmc.c
+++ b/arch/ppc64/kernel/pmc.c
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
--- a/arch/ppc64/kernel/rtas_pci.c
+++ b/arch/ppc64/kernel/rtas_pci.c
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
--- a/arch/ppc64/kernel/signal.c
+++ b/arch/ppc64/kernel/signal.c
--- a/arch/ppc64/kernel/signal32.c
+++ b/arch/ppc64/kernel/signal32.c
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
--- a/arch/ppc64/kernel/vio.c
+++ b/arch/ppc64/kernel/vio.c
--- a/arch/ppc64/mm/hash_low.S
+++ b/arch/ppc64/mm/hash_low.S
--- a/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
--- a/arch/ppc64/mm/hash_utils.c
+++ b/arch/ppc64/mm/hash_utils.c
--- a/arch/ppc64/mm/hugetlbpage.c
+++ b/arch/ppc64/mm/hugetlbpage.c
--- a/arch/ppc64/mm/imalloc.c
+++ b/arch/ppc64/mm/imalloc.c
--- a/Show more
+++ b/Show more