From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 26 Jan 2013 14:18:28 +0000 (+0000)
Subject: Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v2.7.1~3645
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=13144781d4e9e6100b398213f9000576a3dc88f9;p=mirror_qemu.git

Merge branch 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf

* 'ppc-for-upstream' of git://repo.or.cz/qemu/agraf:
  PPC: e500: Select MPIC v4.2 on ppce500 platform
  PPC: e500: fix mpic_iack address
  openpic: add basic support for MPIC v4.2
  openpic: fix timer address decoding
  openpic: fix remaining issues from idr-to-destmask conversion
  pseries: Adjust default VIO address allocations to play better with libvirt
  pseries: Improve handling of multiple PCI host bridges
  target-ppc: Give a meaningful error if too many threads are specified
  cuda: Move ADB bus into CUDA state
  adb: QOM'ify ADB devices
  adb: QOM'ify Apple Desktop Bus
  cuda: QOM'ify CUDA
  ide/macio: QOM'ify MacIO IDE
  mac_nvram: QOM'ify MacIO NVRAM
  mac_nvram: Mark as Big Endian
  mac_nvram: Clean up public API
  macio: Split MacIO in two
  macio: Delay qdev init until all fields are initialized
  macio: QOM'ify some more
  ppc: Move Mac machines to hw/ppc/
---

13144781d4e9e6100b398213f9000576a3dc88f9