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>
This commit is contained in:
Ingo Molnar 2009-06-17 13:06:17 +02:00
commit a3d06cc6aa
3791 changed files with 363227 additions and 155118 deletions

Some files were not shown because too many files have changed in this diff Show more