Merge commit 'v2.6.29-rc7' into perfcounters/core

Conflicts:
	arch/x86/mm/iomap_32.c

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/ia64/kernel/iosapic.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/mm/pat.c
Simple merge

diff --cc arch/x86/oprofile/op_model_ppro.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/input/mouse/Kconfig
Simple merge

diff --cc drivers/pci/dmar.c
Simple merge

diff --cc drivers/pci/intr_remapping.c
Simple merge

diff --cc include/linux/io-mapping.h
Simple merge

diff --cc include/linux/sched.h
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