From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Mar 2011 22:19:09 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~11272
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=869c34f5208adde010065c387354f2ebe4ec3bfc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: ce4100: Set pci ops via callback instead of module init
  x86/mm: Fix pgd_lock deadlock
  x86/mm: Handle mm_fault_error() in kernel space
  x86: Don't check for BIOS corruption in first 64K when there's no need to
---

869c34f5208adde010065c387354f2ebe4ec3bfc