diff options
author | Arnd Bergmann <[email protected]> | 2020-03-25 14:52:01 +0100 |
---|---|---|
committer | Arnd Bergmann <[email protected]> | 2020-03-25 14:52:01 +0100 |
commit | 36d94b4681db2ae2049e1d2dfd70d66d9f4d76ee (patch) | |
tree | c8acc22b9d441bd3857af2a7d2f8723ee0a08ab3 /drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | |
parent | 90ae9ee792537e5a0018555d35b274b0a0b5e51d (diff) | |
parent | aef067e8e95d856bc09557a91e740b2d6a81a6ae (diff) |
Merge tag 'omap-for-v5.7/ti-sysc-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/drivers
Fix for ti-sysc suspend/resume issue on am335x for v5.7 merge window
Just merge in a ti-sysc fix for am335x lcdc suspend/resume issue, and
resolve merge conflict.
* tag 'omap-for-v5.7/ti-sysc-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
bus: ti-sysc: Fix quirk flags for lcdc on am335x
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c')
0 files changed, 0 insertions, 0 deletions