summaryrefslogtreecommitdiff
path: root/kernel/livepatch/core.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-06-22 16:26:56 +0200
committerJiri Kosina <jkosina@suse.cz>2015-06-22 16:26:56 +0200
commit110c146645140636995c3cf6c6d782008ff67ce8 (patch)
tree8f23201e88c120769cec6fb70f3084cd492ac624 /kernel/livepatch/core.c
parent9a1bd63cdae4b623494c4ebaf723a91c35ec49fb (diff)
parent535b3ddc285825c058cef3436a9aa207edffa6cd (diff)
parent26029d88ad1ba6ad7d1f16f22dc67aa8eac0d391 (diff)
downloadlinux-sh-110c146645140636995c3cf6c6d782008ff67ce8.tar.gz
Merge branches 'for-4.1/upstream-fixes', 'for-4.2/kaslr' and 'for-4.2/upstream' into for-linus