Merge commit 'origin/master' into nolen
authorH. Peter Anvin <hpa@zytor.com>
Sun, 2 Mar 2008 20:01:11 +0000 (12:01 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 2 Mar 2008 20:01:11 +0000 (12:01 -0800)
1  2 
NEWS
doc/comboot.txt

diff --cc NEWS
Simple merge
diff --cc doc/comboot.txt
Simple merge