From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 1 Aug 2013 22:09:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber/tags/prep-for-upstream' into staging
X-Git-Tag: v1.6.0-rc2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00f90df09368035fcfe6a06cd87a6c88f82f2afe;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'afaerber/tags/prep-for-upstream' into staging

PReP machine and devices

* Fixes for i82378 PCI-ISA bridge endianness handling

# gpg: Signature made Wed 31 Jul 2013 04:25:51 PM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Hervé Poussineau
# Via Andreas Färber
* afaerber/tags/prep-for-upstream:
  i82378: Cleanup implementation
  pci-host/prep: Set isa_mem_base in the PCI host bridge
---

00f90df09368035fcfe6a06cd87a6c88f82f2afe