projects / profile / ivi / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 234f4a3 01fc061)
Merge commit 'syslinux-3.86' into pathbased syslinux-4.00-pre38
authorH. Peter Anvin <hpa@zytor.com>
Thu, 1 Apr 2010 18:14:56 +0000 (11:14 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 1 Apr 2010 18:14:56 +0000 (11:14 -0700)
commit4f7bd0d7a7b885e5bb6e964151ce663446715044
tree8a091726938eca607e66ab81539b50fd60ae155etree | snapshot
parent234f4a30ac426b535946325fa4125425e152e473commit | diff
parent01fc061d9851463296347d3834185ea5c5618a68commit | diff
Merge commit 'syslinux-3.86' into pathbased

Resolved Conflicts:
core/cpuinit.inc

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Domain: System / Uncategorized;