Merge branch 'master' of ssh://rsync.linux-nfs.org/home/trondmy/www_sites/rsync.linux-nfs.org/pub/linux/nfs-2.6

2026-09-26 18:16:26 +00:00 · 2005-10-18 14:24:35 -07:00 · 2005-10-18 14:24:35 -07:00 · ba9b543d5b
commit ba9b543d5b
parent c8f32be387 6fe43f9e37
76 changed files with 1340 additions and 979 deletions
--- a/7
+++ b/7
--- a/4
+++ b/4
--- 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/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
--- a/arch/mips/pci/fixup-tb0226.c
+++ b/arch/mips/pci/fixup-tb0226.c
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
--- 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/ultra.S
+++ b/arch/sparc64/mm/ultra.S
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.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/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.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/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
--- a/fs/aio.c
+++ b/fs/aio.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/locks.c
+++ b/fs/locks.c
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
--- a/fs/nfs/delegation.h
+++ b/fs/nfs/delegation.h
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
--- a/fs/open.c
+++ b/fs/open.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
--- a/include/asm-arm/arch-pxa/pxafb.h
+++ b/include/asm-arm/arch-pxa/pxafb.h
--- a/include/asm-arm/arch-s3c2410/io.h
+++ b/include/asm-arm/arch-s3c2410/io.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/aio.h
+++ b/include/linux/aio.h
--- a/include/linux/cpumask.h
+++ b/include/linux/cpumask.h
--- a/include/linux/list.h
+++ b/include/linux/list.h
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
--- a/kernel/rcupdate.c
+++ b/kernel/rcupdate.c
--- a/kernel/time.c
+++ b/kernel/time.c
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c