| commit | a3d06cc6aa3e765dc2bf98626f87272dcf641dca | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 13:06:17 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 13:06:17 2009 +0200 |
| tree | aa3e49b58f08d6c0ea55cdca4fb5e6c8ba6ae333 | |
| parent | 0990b1c65729012a63e0eeca93aaaafea4e9a064 [diff] | |
| parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 [diff] |
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>