projects / kernel / kernel-generic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0990b1c 65795ef)
Merge branch 'linus' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 11:06:17 +0000 (13:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 11:06:17 +0000 (13:06 +0200)
commita3d06cc6aa3e765dc2bf98626f87272dcf641dca
treeaa3e49b58f08d6c0ea55cdca4fb5e6c8ba6ae333tree | snapshot
parent0990b1c65729012a63e0eeca93aaaafea4e9a064commit | diff
parent65795efbd380a832ae508b04dba8f8e53f0b84d9commit | 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>
arch/powerpc/include/asm/hw_irq.h diff1 | diff2 | blob | history
include/asm-generic/kmap_types.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
Domain: System / Uncategorized;