Merge remote-tracking branch 'linus/master' into x86/urgent
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 19 Jan 2012 20:56:50 +0000 (12:56 -0800)

Trivial merge