Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-26 18:16:26 +00:00 · 2005-10-23 17:56:59 -07:00 · 2005-10-23 17:56:59 -07:00 · e7d311da9c
commit e7d311da9c
parent c8e0ca683d ba9e358fd0
94 changed files with 1181 additions and 683 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/8
+++ b/8
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.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/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/ia64/lib/swiotlb.c
+++ b/arch/ia64/lib/swiotlb.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/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/um/include/sysdep-x86_64/ptrace.h
+++ b/arch/um/include/sysdep-x86_64/ptrace.h
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.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/n_r3964.c
+++ b/drivers/char/n_r3964.c
--- a/drivers/ieee1394/ohci1394.c
+++ b/drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/raw1394.c
+++ b/drivers/ieee1394/raw1394.c
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.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/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
--- a/drivers/pci/.gitignore
+++ b/drivers/pci/.gitignore
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
--- a/drivers/video/logo/.gitignore
+++ b/drivers/video/logo/.gitignore
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
--- a/fs/aio.c
+++ b/fs/aio.c
--- a/fs/inotify.c
+++ b/fs/inotify.c
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
--- a/include/asm-alpha/atomic.h
+++ b/include/asm-alpha/atomic.h
--- a/include/asm-arm/arch-ixp4xx/entry-macro.S
+++ b/include/asm-arm/arch-ixp4xx/entry-macro.S
--- a/include/asm-arm/arch-ixp4xx/hardware.h
+++ b/include/asm-arm/arch-ixp4xx/hardware.h
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/arch-s3c2410/regs-clock.h
+++ b/include/asm-arm/arch-s3c2410/regs-clock.h
--- a/include/asm-arm/locks.h
+++ b/include/asm-arm/locks.h
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
--- a/kernel/exit.c
+++ b/kernel/exit.c
--- a/kernel/fork.c
+++ b/kernel/fork.c
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
--- a/kernel/posix-timers.c
+++ b/kernel/posix-timers.c
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/lib/.gitignore
+++ b/lib/.gitignore
--- a/lib/idr.c
+++ b/lib/idr.c
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
--- a/mm/memory.c
+++ b/mm/memory.c
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
--- a/scripts/mod/.gitignore
+++ b/scripts/mod/.gitignore
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
--- a/usr/.gitignore
+++ b/usr/.gitignore