Merge branch 'master'

2026-09-18 18:15:59 +00:00 · 2006-08-07 09:16:35 -04:00 · 2006-08-07 09:16:35 -04:00 · ad73c67e79
commit ad73c67e79
parent 08eac93a68 9f737633e6
439 changed files with 5098 additions and 2984 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/accounting/delay-accounting.txt
+++ b/Documentation/accounting/delay-accounting.txt
--- a/Documentation/cpu-freq/user-guide.txt
+++ b/Documentation/cpu-freq/user-guide.txt
--- a/Documentation/cpu-hotplug.txt
+++ b/Documentation/cpu-hotplug.txt
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
--- a/Documentation/infiniband/ipoib.txt
+++ b/Documentation/infiniband/ipoib.txt
--- a/Documentation/initrd.txt
+++ b/Documentation/initrd.txt
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
--- a/Documentation/usb/proc_usb_info.txt
+++ b/Documentation/usb/proc_usb_info.txt
--- a/Documentation/usb/usb-help.txt
+++ b/Documentation/usb/usb-help.txt
--- a/36
+++ b/36
--- a/7
+++ b/7
--- a/arch/alpha/kernel/err_ev7.c
+++ b/arch/alpha/kernel/err_ev7.c
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
--- a/arch/alpha/kernel/sys_ruffian.c
+++ b/arch/alpha/kernel/sys_ruffian.c
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
--- a/arch/arm/mach-at91rm9200/irq.c
+++ b/arch/arm/mach-at91rm9200/irq.c
--- a/arch/arm/mach-imx/irq.c
+++ b/arch/arm/mach-imx/irq.c
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
--- a/arch/arm/mach-iop3xx/iop321-irq.c
+++ b/arch/arm/mach-iop3xx/iop321-irq.c
--- a/arch/arm/mach-iop3xx/iop331-irq.c
+++ b/arch/arm/mach-iop3xx/iop331-irq.c
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
--- a/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/arch-lpd7a40x.c
--- a/arch/arm/mach-lh7a40x/irq-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-kev7a400.c
--- a/arch/arm/mach-lh7a40x/irq-lh7a400.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a400.c
--- a/arch/arm/mach-lh7a40x/irq-lh7a404.c
+++ b/arch/arm/mach-lh7a40x/irq-lh7a404.c
--- a/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
+++ b/arch/arm/mach-lh7a40x/irq-lpd7a40x.c
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.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-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
--- a/arch/arm/mach-shark/irq.c
+++ b/arch/arm/mach-shark/irq.c
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/i386/kernel/cpu/cpufreq/Kconfig
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c
--- a/arch/i386/kernel/cpu/mcheck/mce.h
+++ b/arch/i386/kernel/cpu/mcheck/mce.h
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
--- a/arch/i386/kernel/vsyscall.lds.S
+++ b/arch/i386/kernel/vsyscall.lds.S
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
--- a/arch/ia64/kernel/pal.S
+++ b/arch/ia64/kernel/pal.S
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
--- a/arch/ia64/lib/Makefile
+++ b/arch/ia64/lib/Makefile
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
--- a/arch/ia64/sn/pci/tioce_provider.c
+++ b/arch/ia64/sn/pci/tioce_provider.c
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
--- a/Show more
+++ b/Show more