]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branches 'vfio/fixes' and 'vfio/platform' into vfio-next-20171113.0
authorAlex Williamson <alex.williamson@redhat.com>
Mon, 13 Nov 2017 20:59:45 +0000 (13:59 -0700)
committerAlex Williamson <alex.williamson@redhat.com>
Mon, 13 Nov 2017 20:59:45 +0000 (13:59 -0700)

Trivial merge