Merge commit 'v2.6.29-rc7' into perfcounters/core
Ingo Molnar [Wed, 4 Mar 2009 10:42:31 +0000 (11:42 +0100)]
Conflicts:
arch/x86/mm/iomap_32.c

17 files changed:
1  2 
Documentation/kernel-parameters.txt
Makefile
arch/ia64/kernel/iosapic.c
arch/x86/Kconfig
arch/x86/kernel/ptrace.c
arch/x86/mm/pat.c
arch/x86/oprofile/op_model_ppro.c
drivers/gpu/drm/i915/i915_gem.c
drivers/input/mouse/Kconfig
drivers/pci/dmar.c
drivers/pci/intr_remapping.c
include/linux/io-mapping.h
include/linux/sched.h
init/main.c
kernel/sched.c
kernel/sys.c
mm/vmalloc.c

Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sys.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge