projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a852cbf
55d8085
)
Merge branch 'x86/urgent' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000
(06:30 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 26 Feb 2009 05:30:42 +0000
(06:30 +0100)
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
1
2
arch/x86/xen/enlighten.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/xen/enlighten.c
Simple merge