diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 15:34:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 15:34:49 -0400 |
| commit | e06df6a7eae1ab1ef4deb076aeeaed90e948e5c0 (patch) | |
| tree | ff3a95036550939440f5cd2e7d251bb303b337f9 /drivers/ide/ide-floppy.c | |
| parent | c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d (diff) | |
| parent | 9dd721c6dbfc310f94306902611f86dda87a45fa (diff) | |
Merge branch 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kaslr update from Ingo Molnar:
"This adds kernel module load address randomization"
* 'x86-kaslr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, kaslr: fix module lock ordering problem
x86, kaslr: randomize module base load address
Diffstat (limited to 'drivers/ide/ide-floppy.c')
0 files changed, 0 insertions, 0 deletions