tree 7e5f6d050b72ab08a4497e82a4a103fefb086e80
parent 56396e6823fe9b42fe9cf9403d6ed67756255f70
parent 521cb40b0c44418a4fd36dc633f575813d59a43d
author Ingo Molnar <mingo@elte.hu> 1300174184 +0100
committer Ingo Molnar <mingo@elte.hu> 1300174184 +0100

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: Ingo Molnar <mingo@elte.hu>