Merge commit '305b07680f' into orion/master

2026-09-28 19:20:30 +00:00 · 2009-03-15 21:41:23 -04:00 · 2009-03-15 21:41:23 -04:00 · d6f818f71f
commit d6f818f71f
parent ace14b8263 305b07680f
471 changed files with 15004 additions and 2823 deletions
--- a/Documentation/ABI/testing/sysfs-bus-pci
+++ b/Documentation/ABI/testing/sysfs-bus-pci
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
--- a/Documentation/cgroups/cpusets.txt
+++ b/Documentation/cgroups/cpusets.txt
--- a/Documentation/driver-model/device.txt
+++ b/Documentation/driver-model/device.txt
--- a/Documentation/dvb/README.flexcop
+++ b/Documentation/dvb/README.flexcop
--- a/Documentation/dvb/technisat.txt
+++ b/Documentation/dvb/technisat.txt
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/scsi/cxgb3i.txt
+++ b/Documentation/scsi/cxgb3i.txt
--- a/6
+++ b/6
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
--- a/arch/arm/kernel/fiq.c
+++ b/arch/arm/kernel/fiq.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
--- a/arch/arm/mach-davinci/board-evm.c
+++ b/arch/arm/mach-davinci/board-evm.c
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
--- a/arch/arm/mach-davinci/usb.c
+++ b/arch/arm/mach-davinci/usb.c
--- a/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/arch/arm/mach-ep93xx/include/mach/platform.h
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
--- a/arch/arm/mach-mx1/mx1ads.c
+++ b/arch/arm/mach-mx1/mx1ads.c
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
--- a/arch/arm/mm/copypage-feroceon.c
+++ b/arch/arm/mm/copypage-feroceon.c
--- a/arch/arm/mm/copypage-v3.c
+++ b/arch/arm/mm/copypage-v3.c
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
--- a/arch/arm/mm/copypage-v4wb.c
+++ b/arch/arm/mm/copypage-v4wb.c
--- a/arch/arm/mm/copypage-v4wt.c
+++ b/arch/arm/mm/copypage-v4wt.c
--- a/arch/arm/mm/copypage-xsc3.c
+++ b/arch/arm/mm/copypage-xsc3.c
--- a/arch/arm/mm/copypage-xscale.c
+++ b/arch/arm/mm/copypage-xscale.c
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
--- a/arch/arm/plat-omap/include/mach/common.h
+++ b/arch/arm/plat-omap/include/mach/common.h
--- a/arch/arm/plat-omap/include/mach/pm.h
+++ b/arch/arm/plat-omap/include/mach/pm.h
--- a/arch/arm/plat-s3c64xx/clock.c
+++ b/arch/arm/plat-s3c64xx/clock.c
--- a/arch/arm/plat-s3c64xx/gpiolib.c
+++ b/arch/arm/plat-s3c64xx/gpiolib.c
--- a/arch/arm/plat-s3c64xx/include/plat/irqs.h
+++ b/arch/arm/plat-s3c64xx/include/plat/irqs.h
--- a/arch/arm/plat-s3c64xx/irq-eint.c
+++ b/arch/arm/plat-s3c64xx/irq-eint.c
--- a/arch/arm/plat-s3c64xx/irq.c
+++ b/arch/arm/plat-s3c64xx/irq.c
--- a/arch/arm/plat-s3c64xx/s3c6400-clock.c
+++ b/arch/arm/plat-s3c64xx/s3c6400-clock.c
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
--- a/arch/ia64/configs/xen_domu_defconfig
+++ b/arch/ia64/configs/xen_domu_defconfig
--- a/arch/ia64/include/asm/sn/bte.h
+++ b/arch/ia64/include/asm/sn/bte.h
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
--- a/arch/ia64/xen/Kconfig
+++ b/arch/ia64/xen/Kconfig
--- a/arch/ia64/xen/xen_pv_ops.c
+++ b/arch/ia64/xen/xen_pv_ops.c
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
--- a/arch/m68k/atari/debug.c
+++ b/arch/m68k/atari/debug.c
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
--- a/arch/m68k/include/asm/atarihw.h
+++ b/arch/m68k/include/asm/atarihw.h
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
--- 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/include/asm/seccomp.h
+++ b/arch/mips/include/asm/seccomp.h
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
--- a/arch/powerpc/include/asm/seccomp.h
+++ b/arch/powerpc/include/asm/seccomp.h
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
--- a/arch/powerpc/lib/copyuser_64.S
+++ b/arch/powerpc/lib/copyuser_64.S
--- a/arch/powerpc/lib/memcpy_64.S
+++ b/arch/powerpc/lib/memcpy_64.S
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
--- a/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
+++ b/arch/sh/kernel/cpu/sh2a/clock-sh7201.c
--- a/arch/sparc/include/asm/compat.h
+++ b/arch/sparc/include/asm/compat.h
--- a/arch/sparc/include/asm/seccomp.h
+++ b/arch/sparc/include/asm/seccomp.h
--- a/arch/sparc/kernel/chmc.c
+++ b/arch/sparc/kernel/chmc.c
--- a/arch/um/drivers/vde_user.c
+++ b/arch/um/drivers/vde_user.c
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
--- a/arch/x86/include/asm/seccomp_32.h
+++ b/arch/x86/include/asm/seccomp_32.h
--- a/arch/x86/include/asm/seccomp_64.h
+++ b/arch/x86/include/asm/seccomp_64.h
--- a/arch/x86/kernel/acpi/wakeup_64.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
--- a/Show more
+++ b/Show more