From: Anthony Liguori Date: Thu, 18 Jul 2013 13:14:22 +0000 (-0500) Subject: Merge remote-tracking branch 'awilliam/tags/vfio-for-qemu-1.6' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=28199c48ed44895012ae0be3b6e8f080404a4d34;p=qemu.git Merge remote-tracking branch 'awilliam/tags/vfio-for-qemu-1.6' into staging vfio: enhanced VGA quirks + AER error containment # gpg: Signature made Wed 17 Jul 2013 05:39:38 PM CDT using RSA key ID 3BB08B22 # gpg: Can't check signature: public key not found # By Alex Williamson (1) and Vijay Mohan Pandarathil (1) # Via Alex Williamson * awilliam/tags/vfio-for-qemu-1.6: vfio: QEMU-AER: Qemu changes to support AER for VFIO-PCI devices vfio-pci: VGA quirk update Message-id: 20130717224939.4763.87264.stgit@bling.home Signed-off-by: Anthony Liguori --- 28199c48ed44895012ae0be3b6e8f080404a4d34