Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ...

Conflicts:
	arch/x86/kernel/trampoline.c
	mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

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

2010-08-31 09:45:46 +02:00

24 KiB

Raw Blame History

View Raw