diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 21:49:28 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 21:49:28 +0200 |
commit | a0841609f658c77f066af9c61a2e13143564fcb4 (patch) | |
tree | 0f0df468b6f852501cd4ed1570701e695b9f5d56 /CREDITS | |
parent | livepatch: add missing printk newlines (diff) | |
parent | livepatch: Cancel transition a safe way for immediate patches (diff) | |
download | linux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.xz linux-a0841609f658c77f066af9c61a2e13143564fcb4.zip |
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions