Merge commit 'v2.6.36-rc7' into core/memblock

Merge reason: Update from -rc3 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

diff --cc include/linux/mm.h
Simple merge

diff --cc mm/page_alloc.c
Simple merge