tree 88f9ffb1357928e463514929a68781a79c1dca97
parent 653f42f6b6348652c02737924abd6a5a6426e7ee
parent e1ad783b12ec8b69da83479c5d21a0d8180bc519
author Linus Torvalds <torvalds@linux-foundation.org> 1323817351 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1323817351 -0800

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "x86, efi: Calling __pa() with an ioremap()ed address is invalid"
  x86, efi: Make efi_call_phys_{prelog,epilog} CONFIG_RELOCATABLE-aware