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

@ -24,7 +24,7 @@
*/
#include <hw/hw.h>
#include <hw/pc.h>
#include <hw/pci.h>
#include <hw/pci/pci.h>
#include <hw/isa.h>
#include "qemu-error.h"
#include "qemu-timer.h"