Skip to content
GitLab
Commit 6b7b8e48 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'master' into upstream. 

This is sync with Linus' tree to receive KEY_IMAGES definition
that went in through input tree.
parents b50f315c c1d10d18
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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