git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ff55df5
ac5672f
)
Merge branch 'x86/paravirt' into x86/cpu
author
Ingo Molnar
<mingo@elte.hu>
Tue, 1 Sep 2009 10:13:30 +0000
(12:13 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 1 Sep 2009 10:13:30 +0000
(12:13 +0200)
Conflicts:
arch/x86/include/asm/paravirt.h
Manual merge:
arch/x86/include/asm/paravirt_types.h
Merge reason: x86/paravirt conflicts non-trivially with x86/cpu,
resolve it.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff