summaryrefslogtreecommitdiff
path: root/kernel/power/snapshot.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-28 23:42:36 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-02-28 23:42:36 +0300
commitca9400ef7f6793288db95ca658dede6e71e777d6 (patch)
tree5e935bb2713f47d782ea75800e889729d3cbc0ee /kernel/power/snapshot.c
parentf6a9a2d64dd168b7d71076c0e6b2be7db7cb7399 (diff)
parent7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff)
downloadlinux-ca9400ef7f6793288db95ca658dede6e71e777d6.tar.xz
Merge 5.17-rc6 into usb-next
We need the USB fixes in here, and it resolves a merge conflict in: drivers/usb/dwc3/dwc3-pci.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/power/snapshot.c')
0 files changed, 0 insertions, 0 deletions