Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 16:38:10 +0000 (09:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Sep 2013 16:38:10 +0000 (09:38 -0700)
commitaafcd5d75797ac423f6a03ce1f801933d4b114dc
tree138af0b67e456b5fc8aa4ecff7f160f79d355e70
parent6832d9652f395f7d13003e3884942c40f52ac1fa
parenta02150610776f66b40257624822a879311592bb2
Merge branch 'x86-kaslr-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 relocation changes from Ingo Molnar:
 "This tree contains a single change, ELF relocation handling in C - one
  of the kernel randomization patches that makes sense even without
  randomization present upstream"

* 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, relocs: Move ELF relocation handling to C
arch/x86/Kconfig