Merge commit 'v2.6.36-rc3' into x86/memblock (daab7fc7) · Commits · github.com / kvm-riscv / linux

Commit daab7fc7 authored Aug 31, 2010 by

Ingo Molnar

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>

parents 774ea0bc 2bfc96a1

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment