| commit | a3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 19 12:16:12 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Nov 19 12:16:12 2015 -0800 |
| tree | 542e78181dcd7ac022fb581942e284fce2c895cd | |
| parent | 319645cac26c2d065a485f5d59228433ad602f71 [diff] | |
| parent | e41b104c7dba92443e594e6bc86e4b0bf1cdf573 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching Pull livepatching fix from Jiri Kosina: "A fix for module handling in case kASLR has been enabled, from Zhou Chengming" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: livepatch: x86: fix relocation computation with kASLR