Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-09-20 18:15:29 +00:00 · 2007-02-05 13:25:21 +00:00 · 2007-02-05 13:25:21 +00:00 · 4285431fb6
commit 4285431fb6
parent c033a7e3d5 62d0cfcb27
389 changed files with 3094 additions and 2539 deletions
--- a/2
+++ b/2
--- a/Documentation/SubmitChecklist
+++ b/Documentation/SubmitChecklist
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
--- a/Documentation/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
--- a/Documentation/usb/CREDITS
+++ b/Documentation/usb/CREDITS
--- a/48
+++ b/48
--- a/8
+++ b/8
--- a/4
+++ b/4
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
--- a/arch/arm/configs/at91sam9260ek_defconfig
+++ b/arch/arm/configs/at91sam9260ek_defconfig
--- a/arch/arm/configs/at91sam9261ek_defconfig
+++ b/arch/arm/configs/at91sam9261ek_defconfig
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/mach-at91rm9200/at91rm9200_devices.c
+++ b/arch/arm/mach-at91rm9200/at91rm9200_devices.c
--- a/arch/arm/mach-at91rm9200/at91sam9260.c
+++ b/arch/arm/mach-at91rm9200/at91sam9260.c
--- a/arch/arm/mach-at91rm9200/at91sam9261.c
+++ b/arch/arm/mach-at91rm9200/at91sam9261.c
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
--- a/arch/arm/mach-imx/cpufreq.c
+++ b/arch/arm/mach-imx/cpufreq.c
--- a/arch/arm/mach-s3c2410/gpio.c
+++ b/arch/arm/mach-s3c2410/gpio.c
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
--- a/arch/arm/mach-s3c2410/s3c2412-dma.c
+++ b/arch/arm/mach-s3c2410/s3c2412-dma.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
--- a/arch/arm/vfp/vfp.h
+++ b/arch/arm/vfp/vfp.h
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
--- a/arch/avr32/kernel/avr32_ksyms.c
+++ b/arch/avr32/kernel/avr32_ksyms.c
--- a/arch/i386/boot/compressed/relocs.c
+++ b/arch/i386/boot/compressed/relocs.c
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/i386/kernel/cpu/cyrix.c
--- a/arch/i386/kernel/efi.c
+++ b/arch/i386/kernel/efi.c
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
--- a/arch/i386/kernel/paravirt.c
+++ b/arch/i386/kernel/paravirt.c
--- a/arch/i386/kernel/sysenter.c
+++ b/arch/i386/kernel/sysenter.c
--- a/arch/i386/mach-default/setup.c
+++ b/arch/i386/mach-default/setup.c
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
--- a/arch/mips/dec/prom/memory.c
+++ b/arch/mips/dec/prom/memory.c
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
--- a/arch/mips/mips-boards/malta/Makefile
+++ b/arch/mips/mips-boards/malta/Makefile
--- a/arch/mips/mips-boards/sim/sim_setup.c
+++ b/arch/mips/mips-boards/sim/sim_setup.c
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
--- a/arch/mips/momentum/ocelot_g/prom.c
+++ b/arch/mips/momentum/ocelot_g/prom.c
--- a/arch/mips/momentum/ocelot_g/setup.c
+++ b/arch/mips/momentum/ocelot_g/setup.c
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/powerpc/platforms/ps3/Makefile
+++ b/arch/powerpc/platforms/ps3/Makefile
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
--- a/arch/sparc/kernel/smp.c
+++ b/arch/sparc/kernel/smp.c
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
--- a/arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/arch/sparc64/kernel/sun4v_tlb_miss.S
--- a/arch/um/Kconfig.i386
+++ b/arch/um/Kconfig.i386
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
--- a/arch/um/sys-x86_64/signal.c
+++ b/arch/um/sys-x86_64/signal.c
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86_64/ia32/ia32_binfmt.c
--- a/arch/x86_64/ia32/syscall32.c
+++ b/arch/x86_64/ia32/syscall32.c
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/drivers/char/agp/amd-k7-agp.c
+++ b/drivers/char/agp/amd-k7-agp.c
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
--- a/Show more
+++ b/Show more