diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:38:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:38:10 -0700 |
| commit | aafcd5d75797ac423f6a03ce1f801933d4b114dc (patch) | |
| tree | 138af0b67e456b5fc8aa4ecff7f160f79d355e70 /arch/x86/kernel/setup.c | |
| parent | 6832d9652f395f7d13003e3884942c40f52ac1fa (diff) | |
| parent | a02150610776f66b40257624822a879311592bb2 (diff) | |
| download | linux-aafcd5d75797ac423f6a03ce1f801933d4b114dc.tar.gz linux-aafcd5d75797ac423f6a03ce1f801933d4b114dc.tar.bz2 linux-aafcd5d75797ac423f6a03ce1f801933d4b114dc.zip | |
Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/x86/kernel/setup.c')
0 files changed, 0 insertions, 0 deletions