tree c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b
parent b27a43c1e90582facad44de67d02bc9e9f900289
parent d403a6484f0341bf0624d17ece46f24f741b6a92
author Ingo Molnar <mingo@elte.hu> 1223659808 +0200
committer Ingo Molnar <mingo@elte.hu> 1223659808 +0200

Merge branch 'linus' into x86/pat2

Conflicts:
	arch/x86/mm/init_64.c