Merge commit 'v2.6.36-rc7' into core/memblock
authorIngo Molnar <mingo@elte.hu>
Fri, 8 Oct 2010 07:14:51 +0000 (09:14 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 8 Oct 2010 07:15:00 +0000 (09:15 +0200)
commit153db80f8cf74e8700cac96305b6c0b92918f17c
treec2afb28e7b3f4fbf0aacd9edd39d7f895321ca0c
parent5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
parentcb655d0f3d57c23db51b981648e452988c0223f9
Merge commit 'v2.6.36-rc7' into core/memblock

Merge reason: Update from -rc3 to -rc7.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/trampoline.c
include/linux/mm.h
mm/page_alloc.c