Merge branch 'linus' into x86/fixmap

2026-09-24 18:16:04 +00:00 · 2008-06-25 12:30:21 +02:00 · 2008-06-25 12:30:21 +02:00 · 8b7ef4ec5b
commit 8b7ef4ec5b
parent a1d5a8691f 543cf4cb3f
134 changed files with 4010 additions and 2088 deletions
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
--- a/Documentation/cpusets.txt
+++ b/Documentation/cpusets.txt
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
--- a/6
+++ b/6
--- a/2
+++ b/2
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
--- a/arch/alpha/kernel/core_t2.c
+++ b/arch/alpha/kernel/core_t2.c
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
--- a/arch/x86/kernel/geode_32.c
+++ b/arch/x86/kernel/geode_32.c
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/arch/x86/xen/mmu.h
+++ b/arch/x86/xen/mmu.h
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.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_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
--- a/drivers/char/drm/drm_drv.c
+++ b/drivers/char/drm/drm_drv.c
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
--- a/drivers/char/drm/r300_reg.h
+++ b/drivers/char/drm/r300_reg.h
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
--- a/drivers/char/drm/radeon_microcode.h
+++ b/drivers/char/drm/radeon_microcode.h
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
--- a/drivers/hwmon/adt7473.c
+++ b/drivers/hwmon/adt7473.c
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
--- a/drivers/ide/arm/Makefile
+++ b/drivers/ide/arm/Makefile
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
--- a/drivers/infiniband/hw/mthca/mthca_memfree.c
+++ b/drivers/infiniband/hw/mthca/mthca_memfree.c
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
--- a/fs/nfs/mount_clnt.c
+++ b/fs/nfs/mount_clnt.c
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
--- a/fs/select.c
+++ b/fs/select.c
--- a/include/asm-alpha/core_mcpcia.h
+++ b/include/asm-alpha/core_mcpcia.h
--- a/include/asm-alpha/core_t2.h
+++ b/include/asm-alpha/core_t2.h
--- a/include/asm-alpha/io.h
+++ b/include/asm-alpha/io.h
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
--- a/include/asm-alpha/percpu.h
+++ b/include/asm-alpha/percpu.h
--- a/include/asm-alpha/system.h
+++ b/include/asm-alpha/system.h
--- a/include/asm-alpha/vga.h
+++ b/include/asm-alpha/vga.h
--- a/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf527/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf533/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf537/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf548/bfin_serial_5xx.h
--- a/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
+++ b/include/asm-blackfin/mach-bf561/bfin_serial_5xx.h
--- a/Show more
+++ b/Show more