Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into...
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 May 2017 19:49:28 +0000 (21:49 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 May 2017 19:49:28 +0000 (21:49 +0200)
commita0841609f658c77f066af9c61a2e13143564fcb4
tree0f0df468b6f852501cd4ed1570701e695b9f5d56
parent77f8f39a2e463eca89a19b916189d0e4e38f75d8
parente679af627fe875a51d40b9a2b17f08fbde36e0e2
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
kernel/livepatch/core.c