Merge commit 'v2.6.36-rc7' into core/memblock
Ingo Molnar [Fri, 8 Oct 2010 07:14:51 +0000 (09:14 +0200)]
Merge reason: Update from -rc3 to -rc7.

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

1  2 
arch/x86/kernel/trampoline.c
include/linux/mm.h
mm/page_alloc.c

Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge