Skip to content
Commit 8460b3e5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.38' into x86/mm 



Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 56396e68 521cb40b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment