diff options
| author | Peter Maydell | 2015-07-24 10:17:44 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-24 10:17:44 +0200 |
| commit | f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60 (patch) | |
| tree | 0bb0c7ce345aff109ee408b3ec75e32700caa61b /hw/ide/atapi.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into s... (diff) | |
| parent | vfio/pci: Fix bootindex (diff) | |
| download | qemu-f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60.tar.gz qemu-f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60.tar.xz qemu-f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20150723.0' into staging
VFIO fixes for v2.4.0-rc3
- Fix Realtek NIC quirk (Alex Williamson)
- Restore bootindex functionality (Alex Williamson)
# gpg: Signature made Thu Jul 23 19:51:23 2015 BST using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
* remotes/awilliam/tags/vfio-fixes-20150723.0:
vfio/pci: Fix bootindex
vfio/pci: Fix RTL8168 NIC quirks
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/atapi.c')
0 files changed, 0 insertions, 0 deletions