tree 6c427732d93fbb7357b68747bbbc182ba3b1fe9b
parent 52d3c03675fdbe1965b9b1909072b40ad2f80063
parent 03150171dcf9492a96f57cbb2aef088bafcfcd2e
author Linus Torvalds <torvalds@linux-foundation.org> 1300141149 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300141149 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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