Merge branch 'master'

2026-09-16 18:15:52 +00:00 · 2005-10-28 12:30:16 -04:00 · 2005-10-28 12:30:16 -04:00 · 15dbb5a3f9
commit 15dbb5a3f9
parent be697c3f13 5fadd053d9
544 changed files with 15695 additions and 9773 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
--- a/6
+++ b/6
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
--- a/arch/arm/mach-pxa/corgi_lcd.c
+++ b/arch/arm/mach-pxa/corgi_lcd.c
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
--- a/arch/arm/mach-s3c2410/clock.c
+++ b/arch/arm/mach-s3c2410/clock.c
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/mm/consistent.c
+++ b/arch/arm/mm/consistent.c
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
--- a/arch/frv/mb93090-mb00/pci-dma-nommu.c
+++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
--- a/arch/frv/mm/dma-alloc.c
+++ b/arch/frv/mm/dma-alloc.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/lib/swiotlb.c
+++ b/arch/ia64/lib/swiotlb.c
--- a/arch/ia64/sn/kernel/xpc.h
+++ b/arch/ia64/sn/kernel/xpc.h
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
--- a/arch/mips/mm/dma-coherent.c
+++ b/arch/mips/mm/dma-coherent.c
--- a/arch/mips/mm/dma-ip27.c
+++ b/arch/mips/mm/dma-ip27.c
--- a/arch/mips/mm/dma-ip32.c
+++ b/arch/mips/mm/dma-ip32.c
--- a/arch/mips/mm/dma-noncoherent.c
+++ b/arch/mips/mm/dma-noncoherent.c
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
--- a/arch/ppc/8xx_io/cs4218.h
+++ b/arch/ppc/8xx_io/cs4218.h
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
--- a/arch/ppc64/configs/bpa_defconfig
+++ b/arch/ppc64/configs/bpa_defconfig
--- 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/iSeries_htab.c
+++ b/arch/ppc64/kernel/iSeries_htab.c
--- a/arch/ppc64/kernel/mpic.c
+++ b/arch/ppc64/kernel/mpic.c
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
--- a/arch/ppc64/kernel/vdso32/gettimeofday.S
+++ b/arch/ppc64/kernel/vdso32/gettimeofday.S
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
--- a/arch/sh/boards/renesas/rts7751r2d/mach.c
+++ b/arch/sh/boards/renesas/rts7751r2d/mach.c
--- a/arch/sh/cchips/voyagergx/consistent.c
+++ b/arch/sh/cchips/voyagergx/consistent.c
--- a/arch/sh/drivers/pci/dma-dreamcast.c
+++ b/arch/sh/drivers/pci/dma-dreamcast.c
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
--- a/arch/sparc64/solaris/socksys.c
+++ b/arch/sparc64/solaris/socksys.c
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
--- a/arch/um/include/sysdep-i386/thread.h
+++ b/arch/um/include/sysdep-i386/thread.h
--- a/arch/um/include/sysdep-x86_64/ptrace.h
+++ b/arch/um/include/sysdep-x86_64/ptrace.h
--- a/arch/um/include/sysdep-x86_64/thread.h
+++ b/arch/um/include/sysdep-x86_64/thread.h
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
--- a/arch/xtensa/kernel/pci-dma.c
+++ b/arch/xtensa/kernel/pci-dma.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
--- a/drivers/block/noop-iosched.c
+++ b/drivers/block/noop-iosched.c
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
--- a/drivers/char/.gitignore
+++ b/drivers/char/.gitignore
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
--- a/drivers/infiniband/hw/mthca/mthca_cmd.h
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/infiniband/hw/mthca/mthca_memfree.h
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.h
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
--- a/drivers/net/b44.h
+++ b/drivers/net/b44.h
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
--- a/Show more
+++ b/Show more