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

2026-09-14 18:22:56 +00:00 · 2005-06-18 08:36:46 +01:00 · 2005-06-18 08:36:46 +01:00 · 0107b3cf32
commit 0107b3cf32
parent 1c3f45ab2f 9ee1c939d1
257 changed files with 4892 additions and 2799 deletions
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/boot/compressed/head-xscale.S
+++ b/arch/arm/boot/compressed/head-xscale.S
--- a/arch/arm/configs/badge4_defconfig
+++ b/arch/arm/configs/badge4_defconfig
--- a/arch/arm/configs/h3600_defconfig
+++ b/arch/arm/configs/h3600_defconfig
--- a/arch/arm/configs/hackkit_defconfig
+++ b/arch/arm/configs/hackkit_defconfig
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/lib/io-writesw-armv4.S
+++ b/arch/arm/lib/io-writesw-armv4.S
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
--- a/arch/arm/mach-s3c2410/dma.c
+++ b/arch/arm/mach-s3c2410/dma.c
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
--- a/arch/arm/mm/copypage-xscale.S
+++ b/arch/arm/mm/copypage-xscale.S
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
--- a/arch/arm/mm/minicache.c
+++ b/arch/arm/mm/minicache.c
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
--- a/arch/m68k/defconfig
+++ b/arch/m68k/defconfig
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/ppc/kernel/cputable.c
+++ b/arch/ppc/kernel/cputable.c
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
--- a/arch/ppc/platforms/pmac_cpufreq.c
+++ b/arch/ppc/platforms/pmac_cpufreq.c
--- a/arch/ppc64/boot/prom.c
+++ b/arch/ppc64/boot/prom.c
--- 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/entry.S
+++ b/arch/ppc64/kernel/entry.S
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
--- a/arch/ppc64/kernel/iSeries_setup.c
+++ b/arch/ppc64/kernel/iSeries_setup.c
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
--- a/arch/ppc64/kernel/prom_init.c
+++ b/arch/ppc64/kernel/prom_init.c
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
--- a/arch/ppc64/kernel/smp.c
+++ b/arch/ppc64/kernel/smp.c
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
--- a/arch/ppc64/kernel/syscalls.c
+++ b/arch/ppc64/kernel/syscalls.c
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
--- a/arch/s390/appldata/appldata_mem.c
+++ b/arch/s390/appldata/appldata_mem.c
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
--- a/arch/s390/appldata/appldata_os.c
+++ b/arch/s390/appldata/appldata_os.c
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
--- a/arch/um/Kconfig_char
+++ b/arch/um/Kconfig_char
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
--- a/arch/um/drivers/chan_user.c
+++ b/arch/um/drivers/chan_user.c
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
--- a/arch/um/drivers/slip.h
+++ b/arch/um/drivers/slip.h
--- a/arch/um/drivers/slip_common.c
+++ b/arch/um/drivers/slip_common.c
--- a/arch/um/drivers/slip_common.h
+++ b/arch/um/drivers/slip_common.h
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
--- a/arch/um/drivers/slip_user.c
+++ b/arch/um/drivers/slip_user.c
--- a/arch/um/drivers/slirp.h
+++ b/arch/um/drivers/slirp.h
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
--- a/arch/um/drivers/slirp_user.c
+++ b/arch/um/drivers/slirp_user.c
--- a/arch/um/drivers/stderr_console.c
+++ b/arch/um/drivers/stderr_console.c
--- a/arch/um/include/mconsole.h
+++ b/arch/um/include/mconsole.h
--- a/arch/um/include/net_user.h
+++ b/arch/um/include/net_user.h
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
--- a/arch/um/include/sysdep-i386/ptrace.h
+++ b/arch/um/include/sysdep-i386/ptrace.h
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
--- a/arch/um/kernel/main.c
+++ b/arch/um/kernel/main.c
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
--- a/arch/um/kernel/skas/process_kern.c
+++ b/arch/um/kernel/skas/process_kern.c
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c