From: Peter Maydell Date: Fri, 24 Jul 2015 08:17:44 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20150723.0' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60;p=qemu.git 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 " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " * remotes/awilliam/tags/vfio-fixes-20150723.0: vfio/pci: Fix bootindex vfio/pci: Fix RTL8168 NIC quirks Signed-off-by: Peter Maydell --- f75b709853d2b2b0f2a8e149229aa1c7c1ee1c60