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

2026-09-18 18:15:59 +00:00 · 2005-11-28 17:46:32 -05:00 · 2005-11-28 17:46:32 -05:00 · a880b11a95
commit a880b11a95
parent 899a1fc084 458af5439f
152 changed files with 1134 additions and 1014 deletions
--- a/Documentation/arm/VFP/release-notes.txt
+++ b/Documentation/arm/VFP/release-notes.txt
--- a/Documentation/dvb/faq.txt
+++ b/Documentation/dvb/faq.txt
--- a/Documentation/filesystems/affs.txt
+++ b/Documentation/filesystems/affs.txt
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
--- a/Documentation/floppy.txt
+++ b/Documentation/floppy.txt
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
--- a/Documentation/kernel-docs.txt
+++ b/Documentation/kernel-docs.txt
--- a/Documentation/mca.txt
+++ b/Documentation/mca.txt
--- a/Documentation/networking/driver.txt
+++ b/Documentation/networking/driver.txt
--- a/Documentation/networking/ifenslave.c
+++ b/Documentation/networking/ifenslave.c
--- a/Documentation/networking/iphase.txt
+++ b/Documentation/networking/iphase.txt
--- a/Documentation/networking/irda.txt
+++ b/Documentation/networking/irda.txt
--- a/Documentation/networking/ray_cs.txt
+++ b/Documentation/networking/ray_cs.txt
--- a/Documentation/networking/vortex.txt
+++ b/Documentation/networking/vortex.txt
--- a/Documentation/power/pci.txt
+++ b/Documentation/power/pci.txt
--- a/Documentation/scsi/ibmmca.txt
+++ b/Documentation/scsi/ibmmca.txt
--- a/Documentation/usb/ibmcam.txt
+++ b/Documentation/usb/ibmcam.txt
--- a/Documentation/usb/ov511.txt
+++ b/Documentation/usb/ov511.txt
--- a/Documentation/usb/rio.txt
+++ b/Documentation/usb/rio.txt
--- a/Documentation/video4linux/zr36120.txt
+++ b/Documentation/video4linux/zr36120.txt
--- a/20
+++ b/20
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
--- a/arch/i386/pci/common.c
+++ b/arch/i386/pci/common.c
--- a/arch/i386/pci/direct.c
+++ b/arch/i386/pci/direct.c
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/powerpc/mm/4xx_mmu.c
+++ b/arch/powerpc/mm/4xx_mmu.c
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
--- a/arch/powerpc/mm/tlb_32.c
+++ b/arch/powerpc/mm/tlb_32.c
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
--- a/arch/powerpc/sysdev/dart.h
+++ b/arch/powerpc/sysdev/dart.h
--- a/arch/powerpc/sysdev/u3_iommu.c
+++ b/arch/powerpc/sysdev/u3_iommu.c
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
--- a/arch/sparc/mm/generic.c
+++ b/arch/sparc/mm/generic.c
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
--- a/arch/sparc64/mm/generic.c
+++ b/arch/sparc64/mm/generic.c
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
--- a/arch/um/include/sysdep-x86_64/stub.h
+++ b/arch/um/include/sysdep-x86_64/stub.h
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
--- a/arch/um/sys-i386/stub_segv.c
+++ b/arch/um/sys-i386/stub_segv.c
--- a/arch/um/sys-x86_64/Makefile
+++ b/arch/um/sys-x86_64/Makefile
--- a/arch/um/sys-x86_64/stub_segv.c
+++ b/arch/um/sys-x86_64/stub_segv.c
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
--- a/drivers/char/drm/drm_memory.c
+++ b/drivers/char/drm/drm_memory.c
--- a/drivers/char/drm/drm_memory_debug.h
+++ b/drivers/char/drm/drm_memory_debug.h
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
--- a/drivers/hwmon/lm78.c
+++ b/drivers/hwmon/lm78.c
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
--- a/drivers/net/dgrs.c
+++ b/drivers/net/dgrs.c
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
--- a/drivers/sbus/char/aurora.c
+++ b/drivers/sbus/char/aurora.c
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
--- a/drivers/usb/core/hcd-pci.c
+++ b/drivers/usb/core/hcd-pci.c
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
--- a/drivers/usb/media/sn9c102_core.c
+++ b/drivers/usb/media/sn9c102_core.c
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/drivers/video/console/fbcon_rotate.h
+++ b/drivers/video/console/fbcon_rotate.h
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
--- a/fs/compat.c
+++ b/fs/compat.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
--- a/Show more
+++ b/Show more