diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:26:56 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:26:56 +0200 |
| commit | 110c146645140636995c3cf6c6d782008ff67ce8 (patch) | |
| tree | 8f23201e88c120769cec6fb70f3084cd492ac624 /kernel | |
| parent | livepatch: add module locking around kallsyms calls (diff) | |
| parent | x86: kaslr: fix build due to missing ALIGN definition (diff) | |
| parent | livepatch: annotate klp_init() with __init (diff) | |
| download | linux-dev-110c146645140636995c3cf6c6d782008ff67ce8.tar.xz linux-dev-110c146645140636995c3cf6c6d782008ff67ce8.zip | |
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into for-linus