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)
1  2 
kernel/livepatch/core.c

Simple merge