| commit | 373da0a2a33018d560afcb2c77f8842985d79594 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 13 15:02:31 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 13 15:02:31 2011 -0800 |
| tree | 88f9ffb1357928e463514929a68781a79c1dca97 | |
| parent | 653f42f6b6348652c02737924abd6a5a6426e7ee [diff] | |
| parent | e1ad783b12ec8b69da83479c5d21a0d8180bc519 [diff] |
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