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

Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus 

Conflicts:
	drivers/hid/hid-input.c
parents a32c99e7 d1c7e29e 7bb9d643
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