drivers/hid/hid-ids.h · 817a3125819983956bb8a22455a569aac4e8ea34 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branches 'for-4.1/upstream-fixes', 'for-4.2/upstream' and 'for-4.2/logitech' into for-linus · 817a3125
Jiri Kosina authored Jun 22, 2015
```
Conflicts:
	drivers/hid/hid-logitech-hidpp.c
```
817a3125

hid-ids.h 36.9 KB