projects / platform / upstream / syslinux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9794e01 15cbfdf)
Merge remote-tracking branch 'origin/master' into elflink
authorH. Peter Anvin <hpa@zytor.com>
Fri, 29 Jun 2012 04:34:28 +0000 (21:34 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 29 Jun 2012 04:34:28 +0000 (21:34 -0700)
commit53f267c1e4c6c51819a355e163b4b6c3214a852e
tree376ef236f9de744df4f56e8d13e82f869973a10ftree | snapshot
parent9794e01d73e5cc2621f85d91b0577e33df9920fbcommit | diff
parent15cbfdfd390402057d237664ac087140608bf80bcommit | diff
Merge remote-tracking branch 'origin/master' into elflink

Conflicts:
core/fs/lib/searchconfig.c

Get the reverse pathname lookup fixes from the master branch.
core/fs/fs.c diff1 | diff2 | blob | history
core/fs/lib/searchconfig.c diff1 | diff2 | blob | history
core/include/fs.h diff1 | diff2 | blob | history
Domain: System / Base;