diff options
| author | Jiri Kosina | 2017-07-10 11:11:25 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2017-07-10 11:11:25 +0200 |
| commit | 837c194a4dfedd69ddbd5a586401380190776f48 (patch) | |
| tree | 897ac0dce87f73491bba5a7098d2d7c34da1fc8b /include | |
| parent | 604250ddcf874c4ee4137bf754f57fa903a3c1c1 (diff) | |
| parent | 9609827458c37d7b2c37f2a9255631c603a5004c (diff) | |
| parent | 13b2e1ba486f07ccd26e01c563b52a9171b2c255 (diff) | |
| parent | 283a21da1239d8db7fdf6d9077feed73a6efffa2 (diff) | |
| parent | 08585e43d22802666a466af1ca5795085e74d60d (diff) | |
| parent | 75a5f3ac5c861e969e2379816709d55f1cb5e9f4 (diff) | |
Merge branches 'for-4.13/multitouch', 'for-4.13/retrode', 'for-4.13/transport-open-close-consolidation', 'for-4.13/upstream' and 'for-4.13/wacom' into for-linus