aboutsummaryrefslogtreecommitdiff
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorJiri Kosina2022-05-24 10:58:06 +0200
committerJiri Kosina2022-05-24 10:58:06 +0200
commit2e688e654f48dde6e5899ff62cdf7b2d87f4ad89 (patch)
tree464ee63ca7ea81eb4a2eeaec161304c70513a071 /block/blk-merge.c
parentfa4c7c64360e41bddc53273e185e4b5712c9d534 (diff)
parentf7d8e387d9aeff963e6691c0166269b8042b4ff9 (diff)
Merge branch 'for-5.19/uclogic' into for-linus
- support for wider variety of Huion tablets ported from DIGImend project (José Expósito, Nikolai Kondrashov)
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions