diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:01:10 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 11:01:10 +0200 |
| commit | 18fc2163b8a410d4d36b8f44658580731c0afaa1 (patch) | |
| tree | 5b133f6182a4a791f28a10e1a7d6d25944b8cd87 | |
| parent | d529a4ad91efcf68b65440c6555895fd7ad5a08e (diff) | |
| parent | c846fe9ce90a5ab0329de7f08d7523fb58c1251e (diff) | |
| parent | ac34b970a9ec536c59faa8cdd5678daeae8b9dd3 (diff) | |
| parent | c3883fe06488a483658ba5d849b70e49bee15e7c (diff) | |
| parent | 733aca90300b76575b8a465dc49cbed7a991fd8b (diff) | |
| parent | d3d9adfe3059cb5cb330a2da74ea0bad49b482c0 (diff) | |
| parent | 9547837bdccb4af127528b36a73377150658b4ac (diff) | |
| parent | a4bf6153b317754e058ad9c7f5f02367e0bfdcc8 (diff) | |
| parent | e9d0a26d34818e0f9340316f8016129231560966 (diff) | |
| parent | 07e88a35dcea7d606caae797dff6e82c642d3f68 (diff) | |
| parent | 959d973e9890150342df76160d966ab1270208df (diff) | |
| parent | 149f6f6b8ff3288a88dc34755de7719637cc8cc4 (diff) | |
Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112', 'for-4.12/hid-core-null-state-handling', 'for-4.12/hiddev', 'for-4.12/i2c-hid', 'for-4.12/innomedia', 'for-4.12/logitech-hidpp-battery-power-supply', 'for-4.12/multitouch', 'for-4.12/nti', 'for-4.12/upstream' and 'for-4.12/wacom' into for-linus