From: H. Peter Anvin <hpa@linux.intel.com>
Date: Thu, 19 Jan 2012 20:56:50 +0000 (-0800)
Subject: Merge remote-tracking branch 'linus/master' into x86/urgent
X-Git-Tag: v3.3-rc1~1^4~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=282f445a779ed76fca9884fe377bf56a3088b208;p=linux-2.6-block.git

Merge remote-tracking branch 'linus/master' into x86/urgent
---

282f445a779ed76fca9884fe377bf56a3088b208