diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2024-04-23 13:24:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2024-04-23 13:24:45 +0200 |
| commit | 660a708098569a66a47d0abdad998e29e1259de6 (patch) | |
| tree | 513d7f3cda11cb65f91a6f55b72308accf079c8d /drivers/gpu/drm/i915/display/intel_tv.h | |
| parent | serial: msm: check dma_map_sg() return value properly (diff) | |
| parent | Linux 6.9-rc5 (diff) | |
| download | linux-660a708098569a66a47d0abdad998e29e1259de6.tar.gz linux-660a708098569a66a47d0abdad998e29e1259de6.tar.bz2 linux-660a708098569a66a47d0abdad998e29e1259de6.zip | |
Merge 6.9-rc5 into tty-next
We want the tty fixes in here as well, and it resolves a merge conflict
in:
drivers/tty/serial/serial_core.c
as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_tv.h')
0 files changed, 0 insertions, 0 deletions