diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 21:02:56 +0300 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-07-19 21:02:56 +0300 |
commit | 8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch) | |
tree | 8ef0f3c986968392ccdc70ca43b23eba729e2019 /firmware/cis/COMpad2.cis.ihex | |
parent | 0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff) | |
parent | 6a5029e66404462a3322dba8e35615bd09332081 (diff) | |
download | linux-8c57a5e7b2820f349c95b8c8393fec1e0f4070d2.tar.xz |
Merge branch 'for-linus' into next
Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
Diffstat (limited to 'firmware/cis/COMpad2.cis.ihex')
0 files changed, 0 insertions, 0 deletions