git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
671eef8
af2e1f2
)
Merge branch 'x86/cpu' into x86/core
author
H. Peter Anvin
<hpa@zytor.com>
Thu, 4 Sep 2008 15:08:42 +0000
(08:08 -0700)
committer
H. Peter Anvin
<hpa@zytor.com>
Thu, 4 Sep 2008 15:08:42 +0000
(08:08 -0700)
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff