]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a1bd63 535b3dd 26029d8)
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 patch | diff1 | diff2 | diff3 | blob | history

diff --cc kernel/livepatch/core.c
Simple merge
Ubuntu Artful kernel mirror