| commit | f3199673e6eb29e14af45b6074a7df277f14a850 | [log] [tgz] |
|---|---|---|
| author | Alex Williamson <alex.williamson@redhat.com> | Mon Nov 13 13:59:45 2017 -0700 |
| committer | Alex Williamson <alex.williamson@redhat.com> | Mon Nov 13 13:59:45 2017 -0700 |
| tree | 09fcdaab67e8d9ca31162f081adae4d554ca421f | |
| parent | 71a7d3d78e3ca51ea688ae88c389867d948377cd [diff] | |
| parent | e25883411e80f314f0f76c8eeacd1b47d7e4805b [diff] |
Merge branches 'vfio/fixes' and 'vfio/platform' into vfio-next-20171113.0