Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:55:09 +0000 (21:55 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 04:55:09 +0000 (21:55 -0700)
commitf502c307fcace74e8c99774112016150e8a7a01a
treebb653df246d37ae1f630f43be21bfe087186ab3b
parent651fc2a11d8a95e8d8f9e5aa6f788c2b030499f4
parent327c0dadf173e09348b967746925e995b2b6dfaf
Merge branch 'master' into core32

Conflicts:
core/isolinux.asm
core/abort.inc
core/isolinux.asm