Merge branch 'master' into i915res syslinux-3.85-pre63
authorH. Peter Anvin <hpa@zytor.com>
Mon, 8 Feb 2010 22:39:20 +0000 (14:39 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 8 Feb 2010 22:39:20 +0000 (14:39 -0800)
commitcbbf4aa64d4f7f6d0e3d94b8114a19c0a2ec77ff
treef95d95d54790321e1db19208bea61dd4d2564224
parentaddaeaeb3949d576c4e0eb5cfc133b7c3bcfa8fa
parent60701611cfd3242f5ed4dc8fa985477eb53ad202
Merge branch 'master' into i915res
com32/lib/Makefile