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

2026-10-28 20:03:05 +00:00 · 2009-02-03 09:51:52 -06:00 · 2009-02-03 09:51:52 -06:00 · ed7b44af35
commit ed7b44af35
parent a1a1415e5e b1792e3670
420 changed files with 5786 additions and 2926 deletions
--- a/Documentation/Changes
+++ b/Documentation/Changes
--- a/Documentation/CodingStyle
+++ b/Documentation/CodingStyle
--- a/Documentation/DMA-API.txt
+++ b/Documentation/DMA-API.txt
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/IO-mapping.txt
+++ b/Documentation/IO-mapping.txt
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
--- a/Documentation/block/queue-sysfs.txt
+++ b/Documentation/block/queue-sysfs.txt
--- a/Documentation/cgroups/memcg_test.txt
+++ b/Documentation/cgroups/memcg_test.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/ja_JP/stable_kernel_rules.txt
+++ b/Documentation/ja_JP/stable_kernel_rules.txt
--- a/Documentation/lguest/Makefile
+++ b/Documentation/lguest/Makefile
--- a/Documentation/networking/alias.txt
+++ b/Documentation/networking/alias.txt
--- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
--- a/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
+++ b/Documentation/powerpc/mpc52xx-device-tree-bindings.txt
--- a/Documentation/usb/dma.txt
+++ b/Documentation/usb/dma.txt
--- a/Documentation/video4linux/v4lgrab.c
+++ b/Documentation/video4linux/v4lgrab.c
--- a/2
+++ b/2
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
--- a/arch/alpha/include/asm/bug.h
+++ b/arch/alpha/include/asm/bug.h
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
--- a/arch/alpha/kernel/signal.c
+++ b/arch/alpha/kernel/signal.c
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
--- a/arch/arm/plat-mxc/include/mach/mmc.h
+++ b/arch/arm/plat-mxc/include/mach/mmc.h
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
--- a/arch/mips/include/asm/atomic.h
+++ b/arch/mips/include/asm/atomic.h
--- a/arch/mips/include/asm/mach-rc32434/gpio.h
+++ b/arch/mips/include/asm/mach-rc32434/gpio.h
--- a/arch/mips/include/asm/mach-rc32434/irq.h
+++ b/arch/mips/include/asm/mach-rc32434/irq.h
--- a/arch/mips/include/asm/mach-rc32434/rb.h
+++ b/arch/mips/include/asm/mach-rc32434/rb.h
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
--- a/arch/mips/include/asm/termios.h
+++ b/arch/mips/include/asm/termios.h
--- a/arch/mips/include/asm/txx9/tx4939.h
+++ b/arch/mips/include/asm/txx9/tx4939.h
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/lib/memcpy-inatomic.S
+++ b/arch/mips/lib/memcpy-inatomic.S
--- a/arch/mips/lib/memcpy.S
+++ b/arch/mips/lib/memcpy.S
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
--- a/arch/mips/pci/pci-rc32434.c
+++ b/arch/mips/pci/pci-rc32434.c
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
--- a/arch/mips/rb532/irq.c
+++ b/arch/mips/rb532/irq.c
--- a/arch/mips/rb532/serial.c
+++ b/arch/mips/rb532/serial.c
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
--- a/arch/mips/txx9/rbtx4939/setup.c
+++ b/arch/mips/txx9/rbtx4939/setup.c
--- a/arch/parisc/include/asm/dma-mapping.h
+++ b/arch/parisc/include/asm/dma-mapping.h
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
--- a/arch/powerpc/configs/52xx/cm5200_defconfig
+++ b/arch/powerpc/configs/52xx/cm5200_defconfig
--- a/arch/powerpc/configs/52xx/lite5200b_defconfig
+++ b/arch/powerpc/configs/52xx/lite5200b_defconfig
--- a/arch/powerpc/configs/52xx/motionpro_defconfig
+++ b/arch/powerpc/configs/52xx/motionpro_defconfig
--- a/arch/powerpc/configs/52xx/pcm030_defconfig
+++ b/arch/powerpc/configs/52xx/pcm030_defconfig
--- a/arch/powerpc/configs/52xx/tqm5200_defconfig
+++ b/arch/powerpc/configs/52xx/tqm5200_defconfig
--- a/arch/powerpc/configs/mpc5200_defconfig
+++ b/arch/powerpc/configs/mpc5200_defconfig
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
--- a/arch/x86/include/asm/kvm.h
+++ b/arch/x86/include/asm/kvm.h
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
--- a/arch/x86/include/asm/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
--- a/arch/x86/include/asm/ptrace-abi.h
+++ b/arch/x86/include/asm/ptrace-abi.h
--- a/arch/x86/include/asm/sigcontext.h
+++ b/arch/x86/include/asm/sigcontext.h
--- a/arch/x86/include/asm/sigcontext32.h
+++ b/arch/x86/include/asm/sigcontext32.h
--- a/arch/x86/include/asm/swab.h
+++ b/arch/x86/include/asm/swab.h
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
--- a/arch/x86/kernel/ds.c
+++ b/arch/x86/kernel/ds.c
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
--- a/block/blk-barrier.c
+++ b/block/blk-barrier.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
--- a/block/blk-sysfs.c
+++ b/block/blk-sysfs.c
--- a/block/blk.h
+++ b/block/blk.h
--- a/block/blktrace.c
+++ b/block/blktrace.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/char/selection.c
+++ b/drivers/char/selection.c
--- a/drivers/firewire/fw-card.c
+++ b/drivers/firewire/fw-card.c
--- a/drivers/firewire/fw-device.c
+++ b/drivers/firewire/fw-device.c
--- a/drivers/firewire/fw-device.h
+++ b/drivers/firewire/fw-device.h
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
--- a/drivers/firewire/fw-sbp2.c
+++ b/drivers/firewire/fw-sbp2.c
--- a/drivers/firewire/fw-topology.c
+++ b/drivers/firewire/fw-topology.c
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/Show more
+++ b/Show more