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

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus 

Conflicts:
	drivers/hid/hid-logitech-hidpp.c
parents 7250dc3f 74a3e0c7 8a09b4fa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment