Skip to content
Commit a0841609 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus

parents 77f8f39a e679af62
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment