Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Sat, 27 Jun 2009 00:45:51 +0000 (17:45 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 27 Jun 2009 00:45:51 +0000 (17:45 -0700)
commit4f681e7863bf5b9b18f823c7d9858ff70b139280
tree4fcd6d646df9c87159b27ec017cae4cbf02e635f
parentc97b8cbafac4924cfc3980c0e0d96c813ed4e1f7
parentb1deeb181382bad22846f9c467b64fbda6665e8f
Merge branch 'master' into core32
extlinux/main.c