?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 9376eaf 5de463f)
Merge remote-tracking branch 'origin/rockridge'
commit83730db928b303bc3e9f7bd35c2e64cd85ab0267
authorH. Peter Anvin <hpa@zytor.com>
Wed, 12 Feb 2014 17:56:15 +0000 (12 09:56 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 12 Feb 2014 17:56:15 +0000 (12 09:56 -0800)
treeb383a3263acc13360ab4e6f9c3ac5d5f85888d2btree | snapshot (tar.gz zip)
parent9376eaf8582bcec4aebd697d33836f0d180aee13commit | diff
parent5de463f724da515fd6c5ea49ded6dde178362181commit | diff
Merge remote-tracking branch 'origin/rockridge'

Resolved Conflicts:
com32/include/byteswap.h

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
The Syslinux boot loader collection