tree d5e83e66b09fc405ac70925f9b83152abaf48a03
parent e3ae0acf59244ecf5b023ec99cef4b6b29d649bc
parent 8b7ef4ec5b1ac8b6feebf5ae9cda85a7514728f8
author Ingo Molnar <mingo@elte.hu> 1215512669 +0200
committer Ingo Molnar <mingo@elte.hu> 1215512669 +0200

Merge branch 'x86/fixmap' into x86/devel

Conflicts:

	arch/x86/mm/init_64.c

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