tree aa3e49b58f08d6c0ea55cdca4fb5e6c8ba6ae333
parent 0990b1c65729012a63e0eeca93aaaafea4e9a064
parent 65795efbd380a832ae508b04dba8f8e53f0b84d9
author Ingo Molnar <mingo@elte.hu> 1245236777 +0200
committer Ingo Molnar <mingo@elte.hu> 1245236777 +0200

Merge branch 'linus' into perfcounters/core

Conflicts:
	arch/x86/include/asm/kmap_types.h
	include/linux/mm.h

	include/asm-generic/kmap_types.h

Merge reason: We crossed changes with kmap_types.h cleanups in mainline.

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