Merge branch 'core/types' into x86/x32
authorH. Peter Anvin <hpa@zytor.com>
Fri, 24 Feb 2012 02:35:21 +0000 (18:35 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 24 Feb 2012 02:35:25 +0000 (18:35 -0800)

Trivial merge