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

Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus 

Conflicts:
	drivers/hid/hid-sensor-hub.c
parents 1b15d2e5 368c9664
Expand all 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