projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25258ef 83097ac)
Merge branch 'linus' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
Conflicts:
arch/x86/kernel/paravirt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
include/asm-x86/xen/hypervisor.h patch | diff1 | diff2 | blob | history

diff --cc include/asm-x86/xen/hypervisor.h
Simple merge
Domain: System / Kernel;