Merge branch 'master' into upstream-fixes

2026-09-18 18:15:59 +00:00 · 2007-01-24 02:14:25 -05:00 · 2007-01-24 02:14:25 -05:00 · e47b207a5b
commit e47b207a5b
parent d344bff9c3 419dd8378d
153 changed files with 5485 additions and 1760 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/kdump/kdump.txt
+++ b/Documentation/kdump/kdump.txt
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
--- a/Documentation/usb/CREDITS
+++ b/Documentation/usb/CREDITS
--- a/6
+++ b/6
--- a/4
+++ b/4
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.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/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
--- a/arch/mips/vr41xx/common/irq.c
+++ b/arch/mips/vr41xx/common/irq.c
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
--- a/block/elevator.c
+++ b/block/elevator.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
--- a/drivers/mtd/maps/cstm_mips_ixx.c
+++ b/drivers/mtd/maps/cstm_mips_ixx.c
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
--- a/drivers/mtd/maps/tqm834x.c
+++ b/drivers/mtd/maps/tqm834x.c
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
--- a/drivers/mtd/nand/at91_nand.c
+++ b/drivers/mtd/nand/at91_nand.c
--- a/drivers/mtd/nand/cafe.c
+++ b/drivers/mtd/nand/cafe.c
--- a/drivers/mtd/nand/cafe_ecc.c
+++ b/drivers/mtd/nand/cafe_ecc.c
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
--- a/Show more
+++ b/Show more