Merge branch 'master' into for-linus

2026-09-28 19:20:30 +00:00 · 2009-09-10 00:02:02 +02:00 · 2009-09-10 00:02:02 +02:00 · bf992fa2bc
commit bf992fa2bc
parent 9d7302299e 7135a71b19
232 changed files with 2344 additions and 1586 deletions
--- a/Documentation/filesystems/9p.txt
+++ b/Documentation/filesystems/9p.txt
--- a/3
+++ b/3
--- a/2
+++ b/2
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
--- a/arch/arm/mach-kirkwood/ts219-setup.c
+++ b/arch/arm/mach-kirkwood/ts219-setup.c
--- a/arch/arm/plat-orion/include/plat/gpio.h
+++ b/arch/arm/plat-orion/include/plat/gpio.h
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
--- a/arch/avr32/lib/memcpy.S
+++ b/arch/avr32/lib/memcpy.S
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
--- a/arch/ia64/lib/ip_fast_csum.S
+++ b/arch/ia64/lib/ip_fast_csum.S
--- a/arch/m68k/amiga/config.c
+++ b/arch/m68k/amiga/config.c
--- a/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/arch/m68k/include/asm/motorola_pgalloc.h
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
--- a/arch/m68knommu/kernel/syscalltable.S
+++ b/arch/m68knommu/kernel/syscalltable.S
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
--- a/arch/powerpc/kernel/power7-pmu.c
+++ b/arch/powerpc/kernel/power7-pmu.c
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
--- a/arch/sparc/configs/sparc32_defconfig
+++ b/arch/sparc/configs/sparc32_defconfig
--- a/arch/sparc/configs/sparc64_defconfig
+++ b/arch/sparc/configs/sparc64_defconfig
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
--- a/arch/sparc/kernel/ktlb.S
+++ b/arch/sparc/kernel/ktlb.S
--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
--- a/arch/sparc/kernel/sys32.S
+++ b/arch/sparc/kernel/sys32.S
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
--- a/arch/sparc/mm/init_64.h
+++ b/arch/sparc/mm/init_64.h
--- a/arch/sparc/prom/misc_64.c
+++ b/arch/sparc/prom/misc_64.c
--- a/arch/sparc/prom/printf.c
+++ b/arch/sparc/prom/printf.c
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
--- a/drivers/acpi/acpica/exstorob.c
+++ b/drivers/acpi/acpica/exstorob.c
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
--- a/drivers/firewire/core-iso.c
+++ b/drivers/firewire/core-iso.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c
--- a/drivers/leds/ledtrig-gpio.c
+++ b/drivers/leds/ledtrig-gpio.c
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
--- a/drivers/md/dm-exception-store.c
+++ b/drivers/md/dm-exception-store.c
--- a/drivers/md/dm-exception-store.h
+++ b/drivers/md/dm-exception-store.h
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
--- a/Show more
+++ b/Show more