diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 14:52:01 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 14:52:01 +0100 |
| commit | 36d94b4681db2ae2049e1d2dfd70d66d9f4d76ee (patch) | |
| tree | c8acc22b9d441bd3857af2a7d2f8723ee0a08ab3 /fs/btrfs/transaction.c | |
| parent | Merge tag 'imx-drivers-5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | Merge branch 'fix-lcdc-quirk' into omap-for-v5.7/ti-sysc (diff) | |
| download | linux-36d94b4681db2ae2049e1d2dfd70d66d9f4d76ee.tar.xz linux-36d94b4681db2ae2049e1d2dfd70d66d9f4d76ee.zip | |
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/pull-1584132028-918607@atomide.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'fs/btrfs/transaction.c')
0 files changed, 0 insertions, 0 deletions