git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dc64a3 fd04808)
Merge branch 'linus' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:35:23 +0000 (12:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:37:32 +0000 (12:37 +0200)
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c


Trivial merge
Pandora Kernel Repository