projects / profile / ivi / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4f5faf) | patch
core: fix mismerges with the master branch
authorH. Peter Anvin <hpa@zytor.com>
Sun, 24 May 2009 04:13:11 +0000 (21:13 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 24 May 2009 04:13:11 +0000 (21:13 -0700)
commitfe3240ceb70e61c42a0d3224f065b67eafe60711
tree5000f6560534b478583f0d300508038978a6d285tree | snapshot
parentf4f5faffaafb0fa41345df9c8d872b00208db21acommit | diff
core: fix mismerges with the master branch

Fix a couple of minor issues caused by mismerge with the master
branch.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/conio.inc diff | blob | history
core/pm.inc diff | blob | history
Domain: System / Uncategorized;