diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-06 12:05:35 +0200 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-06 12:05:35 +0200 |
commit | fbdf8d4bef4917713e7ec2fc006041a2b449605a (patch) | |
tree | b56dab8ee777bfd8a40001eaab25cb0cd5695f86 /drivers/gpu/drm/lima/lima_object.c | |
parent | 151a41014bff92f353263cadc051435dc9c3258e (diff) |
gpio: Fix further merge errors
The previous merge of v5.3-rc7 was struggle enough, now it
gave rise to new errors and now I fix those too.
Fixes: 151a41014bff ("Merge tag 'v5.3-rc7' into devel")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpu/drm/lima/lima_object.c')
0 files changed, 0 insertions, 0 deletions