Conflicts:

	include/asm-x86/dma-mapping.h
	include/asm-x86/namei.h
	include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>