]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
projects / mirror_ubuntu-bionic-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83fd5dd 287b8e1)
Merge branch 'for-4.15/alps' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:04:13 +0000 (11:04 +0100)
committerJiri Kosina <jkosina@suse.cz>
Wed, 15 Nov 2017 10:04:13 +0000 (11:04 +0100)
- New ALPS touchpad (T4, found currently on HP EliteBook 1000, Zbook Stduio
  and HP Elite book x360) support from Masaki Ota

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

diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
ubuntu-bionic-kernel mirror