Merge tag 'v3.8-rc5' into x86/mm
authorH. Peter Anvin <hpa@linux.intel.com>
Sat, 26 Jan 2013 00:31:21 +0000 (16:31 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Sat, 26 Jan 2013 00:31:21 +0000 (16:31 -0800)
The __pa() fixup series that follows touches KVM code that is not
present in the existing branch based on v3.7-rc5, so merge in the
current upstream from Linus.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Trivial merge