Merge branch 'master' into core32
authorH. Peter Anvin <hpa@zytor.com>
Mon, 18 May 2009 22:05:20 +0000 (15:05 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 18 May 2009 22:05:20 +0000 (15:05 -0700)
1  2 
core/conio.inc

diff --cc core/conio.inc
Simple merge