Merge remote branch 'gerth/ifcpu_remove_defines'
authorH. Peter Anvin <hpa@zytor.com>
Tue, 6 Jul 2010 00:43:51 +0000 (17:43 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 6 Jul 2010 00:43:51 +0000 (17:43 -0700)

Trivial merge