Merge branch 'origin'

2026-09-26 18:16:26 +00:00 · 2007-05-15 16:11:17 -04:00 · 2007-05-15 16:11:17 -04:00 · 6684e323a2
commit 6684e323a2
parent 7531d692d4 0560551dca
39 changed files with 588 additions and 630 deletions
--- a/1
+++ b/1
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
+++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
--- a/arch/i386/kernel/smpcommon.c
+++ b/arch/i386/kernel/smpcommon.c
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
--- a/arch/m68k/lib/uaccess.c
+++ b/arch/m68k/lib/uaccess.c
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
--- a/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/drivers/infiniband/hw/ehca/ehca_classes.h
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
--- a/include/asm-alpha/mmu_context.h
+++ b/include/asm-alpha/mmu_context.h
--- a/include/asm-h8300/atomic.h
+++ b/include/asm-h8300/atomic.h
--- a/include/asm-i386/processor.h
+++ b/include/asm-i386/processor.h
--- a/include/asm-m68k/uaccess.h
+++ b/include/asm-m68k/uaccess.h
--- a/include/linux/init.h
+++ b/include/linux/init.h
--- a/include/linux/io.h
+++ b/include/linux/io.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
--- a/kernel/time/clocksource.c
+++ b/kernel/time/clocksource.c