Merge remote branch 'linus/master' into x86/bootmem
authorH. Peter Anvin <hpa@zytor.com>
Thu, 11 Feb 2010 00:55:28 +0000 (16:55 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 11 Feb 2010 00:55:28 +0000 (16:55 -0800)

Trivial merge