git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f1c5d30
c1b362e
)
Merge branch 'x86/urgent' into x86/cpu
author
H. Peter Anvin
<hpa@zytor.com>
Thu, 28 Aug 2008 02:17:07 +0000
(19:17 -0700)
committer
H. Peter Anvin
<hpa@zytor.com>
Thu, 28 Aug 2008 02:17:07 +0000
(19:17 -0700)
Conflicts:
arch/x86/kernel/cpu/cyrix.c
Trivial merge