Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Sun, 14 Jun 2009 23:21:33 +0000 (16:21 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 14 Jun 2009 23:21:33 +0000 (16:21 -0700)
commitaba4633355325e8415daf0081da0ae94ec51c90c
treeb13af0f135fb8aabd0ac2529c8fb21e4cdf8f562
parent79c5c65e1dcd3ab954d564876f571794768263d1
parent6bb2cbbf970aec9cb480de6e0df4918ffc766c0b
Merge branch 'master' into core32

Resolved Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/bootsect.inc