Merge branch 'master' of /usr/src/ntfs-2.6/

2026-09-18 18:15:59 +00:00 · 2005-10-17 15:00:34 +01:00 · 2005-10-17 15:00:34 +01:00 · 7946ada30b
commit 7946ada30b
parent 98b270362b 3d80636a0d
122 changed files with 1707 additions and 1675 deletions
--- a/Documentation/connector/connector.txt
+++ b/Documentation/connector/connector.txt
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
--- a/7
+++ b/7
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/mach-l7200/core.c
+++ b/arch/arm/mach-l7200/core.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-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
--- a/arch/arm/mach-s3c2410/mach-anubis.c
+++ b/arch/arm/mach-s3c2410/mach-anubis.c
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
--- a/arch/arm/mach-s3c2410/s3c2440.c
+++ b/arch/arm/mach-s3c2410/s3c2440.c
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
--- a/arch/arm/nwfpe/fpa11.c
+++ b/arch/arm/nwfpe/fpa11.c
--- a/arch/arm/nwfpe/fpa11.h
+++ b/arch/arm/nwfpe/fpa11.h
--- a/arch/arm/nwfpe/fpa11_cprt.c
+++ b/arch/arm/nwfpe/fpa11_cprt.c
--- a/arch/arm/nwfpe/fpopcode.h
+++ b/arch/arm/nwfpe/fpopcode.h
--- a/arch/arm/nwfpe/softfloat.h
+++ b/arch/arm/nwfpe/softfloat.h
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
--- a/arch/m32r/kernel/entry.S
+++ b/arch/m32r/kernel/entry.S
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
--- a/arch/mips/pci/fixup-tb0226.c
+++ b/arch/mips/pci/fixup-tb0226.c
--- a/arch/ppc/kernel/cputable.c
+++ b/arch/ppc/kernel/cputable.c
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
--- a/arch/ppc64/kernel/module.c
+++ b/arch/ppc64/kernel/module.c
--- a/arch/ppc64/kernel/pSeries_pci.c
+++ b/arch/ppc64/kernel/pSeries_pci.c
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
--- a/arch/sparc64/kernel/dtlb_base.S
+++ b/arch/sparc64/kernel/dtlb_base.S
--- a/arch/sparc64/kernel/dtlb_prot.S
+++ b/arch/sparc64/kernel/dtlb_prot.S
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
--- a/arch/sparc64/kernel/itlb_base.S
+++ b/arch/sparc64/kernel/itlb_base.S
--- a/arch/sparc64/kernel/ktlb.S
+++ b/arch/sparc64/kernel/ktlb.S
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
--- a/arch/um/include/aio.h
+++ b/arch/um/include/aio.h
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
--- a/drivers/firmware/dell_rbu.c
+++ b/drivers/firmware/dell_rbu.c
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
--- a/fs/nfs_common/nfsacl.c
+++ b/fs/nfs_common/nfsacl.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
--- a/include/asm-arm/arch-pxa/pxafb.h
+++ b/include/asm-arm/arch-pxa/pxafb.h
--- a/include/asm-arm/arch-s3c2410/hardware.h
+++ b/include/asm-arm/arch-s3c2410/hardware.h
--- a/include/asm-arm/arch-s3c2410/io.h
+++ b/include/asm-arm/arch-s3c2410/io.h
--- a/include/asm-powerpc/timex.h
+++ b/include/asm-powerpc/timex.h
--- a/include/asm-ppc/cputable.h
+++ b/include/asm-ppc/cputable.h
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
--- a/include/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.h
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
--- a/include/linux/netfilter_ipv4/ip_nat.h
+++ b/include/linux/netfilter_ipv4/ip_nat.h
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
--- a/Show more
+++ b/Show more