| commit | 56d3703d087d6d399b5ea53de2462b3a9e203150 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@google.com> | Wed Jun 12 17:37:12 2024 +0000 |
| committer | mdb:android-git <superproject-auto-update@invalid> | Fri Jun 14 10:30:05 2024 +0000 |
| tree | 9bd886a3176da66a2a3ce2751bd61be7e7bd8a28 | |
| parent | 359f77377a12a15536a0abf7786cce654f1c2449 [diff] |
Merge f4fab74cb83c ("serial: amba-pl011: Fix DMA transmission in RS485 mode") into android-mainline
Steps on the way to 5.15.150
Resolves merge conflicts in:
fs/erofs/decompressor.c
Change-Id: I4fff98cd6e28b8c2cafa245fb38438c5216039a6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>