Skip to content
GitLab
Commit d9a145fb authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

Merge commit 'linus/master' into bkl/core 

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
parents c9243f5b 45d7f32c
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