git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
403e1c5
319b6ff
)
Merge branch 'x86/trampoline' into x86/urgent
author
H. Peter Anvin
<hpa@zytor.com>
Wed, 30 May 2012 19:11:26 +0000
(12:11 -0700)
committer
H. Peter Anvin
<hpa@zytor.com>
Wed, 30 May 2012 19:11:32 +0000
(12:11 -0700)
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Trivial merge