diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 06:53:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-26 06:53:50 +0100 |
| commit | a560a5672826fc1e057068bda93b3d4c98d037a2 (patch) | |
| tree | 7bc3774f7ec5fa2346a86b7158f975b9a762697a /drivers/usb/typec/class.c | |
| parent | ASoC: Revert "ASoC: dt-bindings: Update example for enabling USB offload on S... (diff) | |
| parent | Linux 6.8-rc6 (diff) | |
| download | linux-a560a5672826fc1e057068bda93b3d4c98d037a2.tar.gz linux-a560a5672826fc1e057068bda93b3d4c98d037a2.zip | |
Merge v6.8-rc6 into usb-next
We need it here for the USB fixes, and it resolves a merge conflict as
reported in linux-next in drivers/usb/roles/class.c
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/class.c')
0 files changed, 0 insertions, 0 deletions