Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Mon, 18 May 2009 23:35:49 +0000 (16:35 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 18 May 2009 23:35:49 +0000 (16:35 -0700)
commit6cb3f144b3ed44206473873f062537a6238c7ef7
tree31845c63974c1760ebdc93b5afef92c2df288b18
parent17edf67be2b8462974f303a8df46b4bd0427d4fe
parent3bbcbd5e834ed51fc40a2a2f2b1476b1e655df76
Merge branch 'master' into core32
core/comboot.inc