diff options
author | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:06:35 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:06:35 +0200 |
commit | be69f70e6395a4ba9c178b2531433547e1955195 (patch) | |
tree | 68285f66f6f9c6c260a5bf4397c6ca33e42a9d58 /include/linux/livepatch.h | |
parent | f09d90864eb7cc00cadbbfd083b4eff84c167981 (diff) | |
parent | 5e4e38446a62a4f50d77b0dd11d4b379dee08988 (diff) | |
parent | 4d4fb97a62105c07dcccd350c391a65f576726c4 (diff) | |
download | linux-stable-be69f70e6395a4ba9c178b2531433547e1955195.tar.gz linux-stable-be69f70e6395a4ba9c178b2531433547e1955195.tar.bz2 linux-stable-be69f70e6395a4ba9c178b2531433547e1955195.zip |
Merge branches 'for-4.7/core', 'for-4.7/livepatching-doc' and 'for-4.7/livepatching-ppc64' into for-linus