Merge commit '1dd3a74d2e' into HEAD

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-12-17 18:17:08 +01:00
commit 6f991980a5
138 changed files with 293 additions and 290 deletions

View file

@ -22,10 +22,10 @@
#include "virtio-net.h"
#include "virtio-serial.h"
#include "virtio-scsi.h"
#include "pci.h"
#include "pci/pci.h"
#include "qemu-error.h"
#include "msi.h"
#include "msix.h"
#include "pci/msi.h"
#include "pci/msix.h"
#include "net.h"
#include "loader.h"
#include "kvm.h"