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

@ -16,8 +16,8 @@
#include "hw.h"
#include "hw/ppc/e500-ccsr.h"
#include "pci.h"
#include "pci_host.h"
#include "pci/pci.h"
#include "pci/pci_host.h"
#include "bswap.h"
#include "ppce500_pci.h"