| commit | a0841609f658c77f066af9c61a2e13143564fcb4 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon May 01 21:49:28 2017 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon May 01 21:49:28 2017 +0200 |
| tree | 0f0df468b6f852501cd4ed1570701e695b9f5d56 | |
| parent | 77f8f39a2e463eca89a19b916189d0e4e38f75d8 [diff] | |
| parent | e679af627fe875a51d40b9a2b17f08fbde36e0e2 [diff] |
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus