diff options
| author | Alex Williamson | 2021-04-06 12:01:51 -0600 |
|---|---|---|
| committer | Alex Williamson | 2021-04-06 12:01:51 -0600 |
| commit | 6a2a235aa6275ffd8db3ef9e0e86cb638b1187d1 (patch) | |
| tree | ee1ba0b09809e4ff5de9321bf8e4086172385253 /drivers/nfc | |
| parent | 1e04ec14204dec28131855d8dd160c3d55d12797 (diff) | |
| parent | a536019d3e7d85a901c5e6a2f2894c0aa0acaefa (diff) | |
| parent | b392a198917020cac996fd207355211ecfcfad84 (diff) | |
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: Alex Williamson <alex.williamson@redhat.com>