diff options
author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:14:10 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:14:10 +0300 |
commit | de6c5070ad3956125fe8d407381c1b18f9749f93 (patch) | |
tree | 2d75a35d43f1e1a5ac8793eab04d4b5886404dc6 /drivers/staging/media/atomisp/pci/atomisp2/Makefile | |
parent | 5c891d5e094c15bd7791dc84749b5239257f5f2d (diff) | |
parent | 9d14201c7444bbdf89413e88d91b73150c3de38b (diff) | |
download | linux-de6c5070ad3956125fe8d407381c1b18f9749f93.tar.xz |
Merge branch 'for-4.14/wacom' into for-linus
- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/Makefile')
0 files changed, 0 insertions, 0 deletions