]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into...
authorJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:26:56 +0000 (16:26 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 22 Jun 2015 14:26:56 +0000 (16:26 +0200)
1  2  3 
kernel/livepatch/core.c

Simple merge