| commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jul 19 11:02:56 2016 -0700 |
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | Tue Jul 19 11:02:56 2016 -0700 |
| tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 | |
| parent | 0bb11e969f5367dcb661f9fcc77efd5d58a2c470 [diff] | |
| parent | 6a5029e66404462a3322dba8e35615bd09332081 [diff] |
Merge branch 'for-linus' into next Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.