Merge branches 'v5.4/vfio/alexey-tce-memory-free-v1', 'v5.4/vfio/connie-re-arrange...
authorAlex Williamson <alex.williamson@redhat.com>
Fri, 23 Aug 2019 17:26:24 +0000 (11:26 -0600)
committerAlex Williamson <alex.williamson@redhat.com>
Fri, 23 Aug 2019 17:26:24 +0000 (11:26 -0600)
1  2  3  4  5  6 
include/uapi/linux/vfio.h

Simple merge