From: Alex Williamson Date: Mon, 13 Nov 2017 20:59:45 +0000 (-0700) Subject: Merge branches 'vfio/fixes' and 'vfio/platform' into vfio-next-20171113.0 X-Git-Tag: v4.15-rc1~123^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f3199673e6eb29e14af45b6074a7df277f14a850;p=users%2Fjedix%2Flinux-maple.git Merge branches 'vfio/fixes' and 'vfio/platform' into vfio-next-20171113.0 --- f3199673e6eb29e14af45b6074a7df277f14a850