git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cf9972a
0af48f4
)
Merge branch 'x86/urgent' into x86/setup
author
H. Peter Anvin
<hpa@zytor.com>
Sat, 23 May 2009 23:42:19 +0000
(16:42 -0700)
committer
H. Peter Anvin
<hpa@zytor.com>
Sat, 23 May 2009 23:42:19 +0000
(16:42 -0700)
Resolved conflicts:
arch/x86/boot/memory.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff