Skip to content
Commit 6a2a235a authored by Alex Williamson's avatar Alex Williamson
Browse files

Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and...


Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio/nvlink' into v5.13/vfio/next

Spelling fixes merged with file deletion.

Conflicts:
	drivers/vfio/pci/vfio_pci_nvlink2.c

Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment