projects
/
platform
/
upstream
/
syslinux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d0a8343
9ce3e9c
)
Merge branch 'master' into fsc
syslinux-4.00-pre12
author
H. Peter Anvin
<hpa@zytor.com>
Thu, 28 Jan 2010 00:16:14 +0000
(16:16 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Thu, 28 Jan 2010 00:16:14 +0000
(16:16 -0800)
Resolved Conflicts:
core/ldlinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
1
2
core/runkernel.inc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/runkernel.inc
Simple merge