tree 034bf57fd5a20f446db1a7d80f2a5abadb962a0e
parent bbcf59bc4ba813b1ff8f1312585f773a675b2e3e
parent 7b4b0e9eda51902b53bc1a2318df53cdb8b72eed
author Anthony Liguori <aliguori@us.ibm.com> 1374153262 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1374153262 -0500
mergetag object 7b4b0e9eda51902b53bc1a2318df53cdb8b72eed
 type commit
 tag vfio-for-qemu-1.6
 tagger Alex Williamson <alex.williamson@redhat.com> 1374100778 -0600
 
 vfio: enhanced VGA quirks + AER error containment
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.13 (GNU/Linux)
 
 iQIcBAABAgAGBQJR5x0qAAoJECObm247sIsim6oP/0n8kUWulJ5v4YUhG6qfpj4e
 5m4PsTUxCCPHjQCeGpooCynMI7qI3fcLTHzZsEY6UrF9wBkPwr0Yjq6lup4tIZt9
 O0USvRAJQHTe/htKfnz3I5yZeRlzlavmuyAqHVJbBTKMBNmCb3omm3U+GnonUb8q
 7SGNF9+NzM+5+O9OjsL7JrShkr7FMuzGR4W5nlKoQdcUyjJpqEYwa2Gmt52atLsn
 EqGOwVi7LCQAileb1j65yWsr71Y7qvz+h8gV1TQi+zdxw09ix64lzZahcZAcgdrn
 X4RSlqQs1PbmW+ddbXj+LmeH4UdNRlimp3gCdsSaDmqmnlPlT0IcVHaJdDgv/6Ea
 SuAPf2GeuRCpHzmfBFNFvmbHus6VWpad4K63L3bXKrwiNwX9hFodpCAH8HfNusff
 szxiF5DM+1+DcpOKUd9g+/t5LChV5n2RYUWABV54UcqTUkeUy0qNpAFLiinsaL3L
 +oAHJtP+ejf3Hbs2ccygvxU8BeWH64MojGxrBgY2Yj5kfWCxEdOjS9X2iWXS9NLt
 ZdFdwH6JQ/LIfyDfE8igVFdCnH4hoA4PzG5Bzi4SZx76uW+ZGRvSaQ8kOgCMP8jq
 6MS2hu4KUMdVNnf2w8IcnoliFK3/y1kxcEbl+0hasKoyf7/7tlLDajKSi7a7DVZ7
 +r7GqWMsLDi4wzYAKMBr
 =pxjI
 -----END PGP SIGNATURE-----

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 <aliguori@us.ibm.com>