summaryrefslogtreecommitdiff
path: root/firmware/cis/COMpad2.cis.ihex
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-19 21:02:56 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-19 21:02:56 +0300
commit8c57a5e7b2820f349c95b8c8393fec1e0f4070d2 (patch)
tree8ef0f3c986968392ccdc70ca43b23eba729e2019 /firmware/cis/COMpad2.cis.ihex
parent0bb11e969f5367dcb661f9fcc77efd5d58a2c470 (diff)
parent6a5029e66404462a3322dba8e35615bd09332081 (diff)
downloadlinux-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