diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-02-20 15:01:57 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-02-20 15:01:57 +0100 |
| commit | 53f724b2432a9f97a941251772f2b0d195e2d282 (patch) | |
| tree | 1b5feae7908776cc556c5133e6f1067da8a7c710 /drivers/hid/wacom.h | |
| parent | f3287a995ac3520b1afcf03932b9c405f502657c (diff) | |
| parent | 12be9f7b5861f14f010ae1ce3b343ae903d7a74d (diff) | |
| parent | fe6cc17f89b2bf044f61d7cc6a45b51ccf86d853 (diff) | |
| parent | d193c169149abb1c54e4e969e78600ae75141e36 (diff) | |
| parent | c7821d0f3d81ef91aff037cef4e23c56bab30d26 (diff) | |
| parent | 7021b60073f8059e1ec8aa140eb5fdfc017d0041 (diff) | |
| parent | a48324de6d4d41dd3974e18ee8cedac4c0dd503a (diff) | |
Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish', 'for-4.11/mayflash', 'for-4.11/microsoft', 'for-4.11/rmi', 'for-4.11/upstream' and 'for-4.11/wacom' into for-linus