diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:33:30 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-06 10:33:30 +0300 |
| commit | 924fb3ec50f5156d21e4f484358fb36f75b91ca8 (patch) | |
| tree | f36b768432fe7f7c07b28857533e1bfe16006abe /Documentation/admin-guide/numastat.rst | |
| parent | 4f6dfc2136fb2e8dc3f571a5caff6b6e88281fc0 (diff) | |
| parent | 4ec5183ec48656cec489c49f989c508b68b518e3 (diff) | |
| download | linux-924fb3ec50f5156d21e4f484358fb36f75b91ca8.tar.xz | |
Merge 6.2-rc7 into usb-next
We need the USB fixes in here, and this resolves a merge conflict with
the i915 driver as reported in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/admin-guide/numastat.rst')
0 files changed, 0 insertions, 0 deletions