summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 15:02:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-13 15:02:31 -0800
commit373da0a2a33018d560afcb2c77f8842985d79594 (patch)
tree88f9ffb1357928e463514929a68781a79c1dca97 /fs/proc
parent653f42f6b6348652c02737924abd6a5a6426e7ee (diff)
parente1ad783b12ec8b69da83479c5d21a0d8180bc519 (diff)
downloadop-kernel-dev-373da0a2a33018d560afcb2c77f8842985d79594.zip
op-kernel-dev-373da0a2a33018d560afcb2c77f8842985d79594.tar.gz
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
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud