Merge commit 'linus/master' into x86/urgent
authorH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 11 Dec 2009 18:57:42 +0000 (10:57 -0800)

Trivial merge