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

Browse source

Conflicts:
	drivers/hid/hid-logitech-hidpp.c

...

This commit is contained in:

Jiri Kosina 2015-06-22 16:22:06 +02:00

parent 7250dc3fee 74a3e0c719 8a09b4fadf

commit 817a312581

18 changed files with 589 additions and 248 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/hid.h

View file