Merge tag 'omap-for-v5.7/ti-sysc-fix-signed' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 13:52:01 +0000 (14:52 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 25 Mar 2020 13:52:01 +0000 (14:52 +0100)
commit36d94b4681db2ae2049e1d2dfd70d66d9f4d76ee
treec8acc22b9d441bd3857af2a7d2f8723ee0a08ab3
parent90ae9ee792537e5a0018555d35b274b0a0b5e51d
parentaef067e8e95d856bc09557a91e740b2d6a81a6ae
Merge tag 'omap-for-v5.7/ti-sysc-fix-signed' of git://git./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/pull-1584132028-918607@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>