]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
projects / people / arne_f / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c891d5 9d14201)
Merge branch 'for-4.14/wacom' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:14:10 +0000 (11:14 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 5 Sep 2017 09:14:10 +0000 (11:14 +0200)
- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann

1  2 
drivers/hid/usbhid/hid-core.c patch | diff1 | diff2 | blob | history
include/linux/hid.h patch | diff1 | diff2 | blob | history

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge
diff --cc include/linux/hid.h
Simple merge
Arne's tree of linux kernel.