Automatic merge with /usr/src/ntfs-2.6.git.

2026-09-16 18:15:52 +00:00 · 2005-05-30 21:34:37 +01:00 · 2005-05-30 21:34:37 +01:00 · 4ff4258a3e
commit 4ff4258a3e
parent 442d207eb0 5e485b7975
139 changed files with 2114 additions and 3465 deletions
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
--- a/arch/ppc/boot/images/Makefile
+++ b/arch/ppc/boot/images/Makefile
--- a/arch/ppc/configs/mpc8555_cds_defconfig
+++ b/arch/ppc/configs/mpc8555_cds_defconfig
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
--- a/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.h
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
--- a/arch/ppc/platforms/pmac_cpufreq.c
+++ b/arch/ppc/platforms/pmac_cpufreq.c
--- a/arch/ppc/platforms/pq2ads.h
+++ b/arch/ppc/platforms/pq2ads.h
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
--- a/arch/ppc/syslib/m8260_pci.c
+++ b/arch/ppc/syslib/m8260_pci.c
--- a/arch/ppc/syslib/m8260_pci.h
+++ b/arch/ppc/syslib/m8260_pci.h
--- a/arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
--- a/arch/ppc/syslib/m82xx_pci.h
+++ b/arch/ppc/syslib/m82xx_pci.h
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
--- a/arch/ppc/syslib/ppc83xx_setup.c
+++ b/arch/ppc/syslib/ppc83xx_setup.c
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
--- a/arch/um/drivers/random.c
+++ b/arch/um/drivers/random.c
--- a/arch/um/drivers/ssl.c
+++ b/arch/um/drivers/ssl.c
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
--- a/arch/um/include/2_5compat.h
+++ b/arch/um/include/2_5compat.h
--- a/arch/um/include/sysrq.h
+++ b/arch/um/include/sysrq.h
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
--- a/arch/um/kernel/initrd_kern.c
+++ b/arch/um/kernel/initrd_kern.c
--- a/arch/um/kernel/initrd_user.c
+++ b/arch/um/kernel/initrd_user.c
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
--- a/arch/um/kernel/process_kern.c
+++ b/arch/um/kernel/process_kern.c
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
--- a/arch/um/kernel/tt/process_kern.c
+++ b/arch/um/kernel/tt/process_kern.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/um/sys-i386/sysrq.c
+++ b/arch/um/sys-i386/sysrq.c
--- a/arch/um/sys-ppc/sysrq.c
+++ b/arch/um/sys-ppc/sysrq.c
--- a/arch/um/sys-x86_64/syscalls.c
+++ b/arch/um/sys-x86_64/syscalls.c
--- a/arch/um/sys-x86_64/sysrq.c
+++ b/arch/um/sys-x86_64/sysrq.c
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86_64/kernel/signal.c
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
--- a/drivers/input/gameport/Kconfig
+++ b/drivers/input/gameport/Kconfig
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
--- a/drivers/input/touchscreen/gunze.c
+++ b/drivers/input/touchscreen/gunze.c
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
--- a/drivers/usb/media/pwc/Makefile
+++ b/drivers/usb/media/pwc/Makefile
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
--- a/drivers/usb/media/pwc/pwc-dec1.c
+++ b/drivers/usb/media/pwc/pwc-dec1.c
--- a/drivers/usb/media/pwc/pwc-dec1.h
+++ b/drivers/usb/media/pwc/pwc-dec1.h
--- a/drivers/usb/media/pwc/pwc-dec23.c
+++ b/drivers/usb/media/pwc/pwc-dec23.c
--- a/drivers/usb/media/pwc/pwc-dec23.h
+++ b/drivers/usb/media/pwc/pwc-dec23.h
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/usb/media/pwc/pwc-if.c
--- a/drivers/usb/media/pwc/pwc-kiara.c
+++ b/drivers/usb/media/pwc/pwc-kiara.c
--- a/drivers/usb/media/pwc/pwc-timon.c
+++ b/drivers/usb/media/pwc/pwc-timon.c
--- a/drivers/usb/media/pwc/pwc-uncompress.c
+++ b/drivers/usb/media/pwc/pwc-uncompress.c
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
--- a/fs/xfs/linux-2.6/xfs_file.c
+++ b/fs/xfs/linux-2.6/xfs_file.c
--- a/fs/xfs/linux-2.6/xfs_ioctl32.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
--- a/fs/xfs/linux-2.6/xfs_ioctl32.h
+++ b/fs/xfs/linux-2.6/xfs_ioctl32.h
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
--- a/Show more
+++ b/Show more