diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-18 08:14:22 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-18 08:14:22 -0500 |
commit | 28199c48ed44895012ae0be3b6e8f080404a4d34 (patch) | |
tree | 034bf57fd5a20f446db1a7d80f2a5abadb962a0e /qemu-char.c | |
parent | bbcf59bc4ba813b1ff8f1312585f773a675b2e3e (diff) | |
parent | 7b4b0e9eda51902b53bc1a2318df53cdb8b72eed (diff) |
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>
Diffstat (limited to 'qemu-char.c')
0 files changed, 0 insertions, 0 deletions