Merge branch 'linus' into core/iommu

2026-09-26 18:16:26 +00:00 · 2009-01-11 00:51:06 +01:00 · 2009-01-11 00:51:06 +01:00 · 0811a433c6
commit 0811a433c6
parent c299030765 3d14bdad40
3721 changed files with 742230 additions and 174578 deletions
--- a/.mailmap
+++ b/.mailmap
--- a/19
+++ b/19
--- a/Documentation/ABI/testing/sysfs-class-regulator
+++ b/Documentation/ABI/testing/sysfs-class-regulator
--- a/Documentation/ABI/testing/sysfs-devices-memory
+++ b/Documentation/ABI/testing/sysfs-devices-memory
--- a/Documentation/DMA-mapping.txt
+++ b/Documentation/DMA-mapping.txt
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/networking.tmpl
+++ b/Documentation/DocBook/networking.tmpl
--- a/Documentation/DocBook/regulator.tmpl
+++ b/Documentation/DocBook/regulator.tmpl
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/PCI/pci.txt
+++ b/Documentation/PCI/pci.txt
--- a/Documentation/RCU/00-INDEX
+++ b/Documentation/RCU/00-INDEX
--- a/Documentation/RCU/rcubarrier.txt
+++ b/Documentation/RCU/rcubarrier.txt
--- a/Documentation/bad_memory.txt
+++ b/Documentation/bad_memory.txt
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
--- a/Documentation/blackfin/bfin-gpio-notes.txt
+++ b/Documentation/blackfin/bfin-gpio-notes.txt
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
--- a/Documentation/controllers/memcg_test.txt
+++ b/Documentation/controllers/memcg_test.txt
--- a/Documentation/controllers/memory.txt
+++ b/Documentation/controllers/memory.txt
--- a/Documentation/crypto/async-tx-api.txt
+++ b/Documentation/crypto/async-tx-api.txt
--- a/Documentation/dell_rbu.txt
+++ b/Documentation/dell_rbu.txt
--- a/Documentation/development-process/4.Coding
+++ b/Documentation/development-process/4.Coding
--- a/Documentation/dmaengine.txt
+++ b/Documentation/dmaengine.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
--- a/Documentation/filesystems/btrfs.txt
+++ b/Documentation/filesystems/btrfs.txt
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/squashfs.txt
+++ b/Documentation/filesystems/squashfs.txt
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
--- a/Documentation/hwmon/abituguru-datasheet
+++ b/Documentation/hwmon/abituguru-datasheet
--- a/Documentation/hwmon/adt7470
+++ b/Documentation/hwmon/adt7470
--- a/Documentation/hwmon/f71882fg
+++ b/Documentation/hwmon/f71882fg
--- a/Documentation/hwmon/it87
+++ b/Documentation/hwmon/it87
--- a/Documentation/hwmon/lm70
+++ b/Documentation/hwmon/lm70
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
--- a/Documentation/hwmon/ltc4245
+++ b/Documentation/hwmon/ltc4245
--- a/Documentation/ide/warm-plug-howto.txt
+++ b/Documentation/ide/warm-plug-howto.txt
--- a/Documentation/input/walkera0701.txt
+++ b/Documentation/input/walkera0701.txt
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
--- a/Documentation/kbuild/modules.txt
+++ b/Documentation/kbuild/modules.txt
--- a/Documentation/kernel-doc-nano-HOWTO.txt
+++ b/Documentation/kernel-doc-nano-HOWTO.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
--- a/Documentation/kprobes.txt
+++ b/Documentation/kprobes.txt
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
--- a/Documentation/memory-hotplug.txt
+++ b/Documentation/memory-hotplug.txt
--- a/Documentation/mips/AU1xxx_IDE.README
+++ b/Documentation/mips/AU1xxx_IDE.README
--- a/Documentation/networking/rxrpc.txt
+++ b/Documentation/networking/rxrpc.txt
--- a/Documentation/networking/tuntap.txt
+++ b/Documentation/networking/tuntap.txt
--- a/Documentation/nommu-mmap.txt
+++ b/Documentation/nommu-mmap.txt
--- a/Documentation/powerpc/cpu_features.txt
+++ b/Documentation/powerpc/cpu_features.txt
--- a/Documentation/powerpc/dts-bindings/4xx/ndfc.txt
+++ b/Documentation/powerpc/dts-bindings/4xx/ndfc.txt
--- a/Documentation/powerpc/dts-bindings/fsl/board.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/board.txt
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
--- a/Documentation/s390/cds.txt
+++ b/Documentation/s390/cds.txt
--- a/Documentation/s390/s390dbf.txt
+++ b/Documentation/s390/s390dbf.txt
--- a/Documentation/scsi/ChangeLog.lpfc
+++ b/Documentation/scsi/ChangeLog.lpfc
--- a/Documentation/scsi/ChangeLog.ncr53c8xx
+++ b/Documentation/scsi/ChangeLog.ncr53c8xx
--- a/Documentation/scsi/ChangeLog.sym53c8xx
+++ b/Documentation/scsi/ChangeLog.sym53c8xx
--- a/Documentation/scsi/scsi_fc_transport.txt
+++ b/Documentation/scsi/scsi_fc_transport.txt
--- a/Documentation/spi/spi-lm70llp
+++ b/Documentation/spi/spi-lm70llp
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
--- a/Documentation/usb/power-management.txt
+++ b/Documentation/usb/power-management.txt
--- a/Documentation/vm/unevictable-lru.txt
+++ b/Documentation/vm/unevictable-lru.txt
--- a/Documentation/w1/masters/00-INDEX
+++ b/Documentation/w1/masters/00-INDEX
--- a/Documentation/w1/masters/mxc-w1
+++ b/Documentation/w1/masters/mxc-w1
--- a/Documentation/w1/w1.netlink
+++ b/Documentation/w1/w1.netlink
--- a/Documentation/wimax/README.i2400m
+++ b/Documentation/wimax/README.i2400m
--- a/Documentation/wimax/README.wimax
+++ b/Documentation/wimax/README.wimax
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
--- a/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
--- a/112
+++ b/112
--- a/3
+++ b/3
--- a/arch/alpha/include/asm/Kbuild
+++ b/arch/alpha/include/asm/Kbuild
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
--- a/arch/alpha/include/asm/byteorder.h
+++ b/arch/alpha/include/asm/byteorder.h
--- a/arch/alpha/include/asm/swab.h
+++ b/arch/alpha/include/asm/swab.h
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
--- a/arch/alpha/kernel/pci_impl.h
+++ b/arch/alpha/kernel/pci_impl.h
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
--- a/arch/alpha/kernel/sys_eiger.c
+++ b/arch/alpha/kernel/sys_eiger.c
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
--- a/arch/alpha/kernel/sys_noritake.c
+++ b/arch/alpha/kernel/sys_noritake.c
--- a/arch/alpha/kernel/sys_ruffian.c
+++ b/arch/alpha/kernel/sys_ruffian.c
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/configs/clps7500_defconfig
+++ b/arch/arm/configs/clps7500_defconfig
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
--- a/arch/arm/include/asm/byteorder.h
+++ b/arch/arm/include/asm/byteorder.h
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
--- a/arch/arm/include/asm/mmu.h
+++ b/arch/arm/include/asm/mmu.h
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
--- a/Show more
+++ b/Show more