summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-elan.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-10-01 14:20:45 +0300
committerLinus Walleij <linus.walleij@linaro.org>2018-10-01 14:20:45 +0300
commit30aa69e7bd9f7af3574120249eecb3726dcaf737 (patch)
treeb4a9ec1374ec9aed1022fdb32802c483952e5a97 /drivers/hid/hid-elan.c
parent63e037bc51b32d414cd07dd700e71359ce27a11f (diff)
parent17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff)
downloadlinux-30aa69e7bd9f7af3574120249eecb3726dcaf737.tar.xz
Merge tag 'v4.19-rc6' into devel
This is the 4.19-rc6 release I needed to merge this in because of extensive conflicts in the MSM and Intel pin control drivers. I know how to resolve them, so let's do it like this. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/hid/hid-elan.c')
0 files changed, 0 insertions, 0 deletions