From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 11 Mar 2013 01:39:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into staging
X-Git-Tag: v1.5.0-rc0~486
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3889162ff724d09eb6b6bd06ba54769100a77f;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'origin/master' into staging

* origin/master: (75 commits)
  tcg: Don't make exitreq flag a local temporary
  Makefile: Add subdir dependency on config-devices-all.mak
  make_device_config.sh: Emit dependency file to directory where included
  Revert "make_device_config.sh: Fix target path in generated dependency file"
  s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
  s390/css: Fix subchannel detection
  Allow virtio-net features for legacy s390 virtio bus
  s390: virtio-ccw maintainer
  s390: simplify kvm cpu init
  pseries: Add compatible property to root of device tree
  target-ppc: Move CPU aliases out of translate_init.c
  target-ppc: Report CPU aliases for QMP
  target-ppc: List alias names alongside CPU models
  target-ppc: Make host CPU a subclass of the host's CPU model
  PPC: xnu kernel expects FLUSH to be cleared on STOP
  PPC: Fix dma interrupt
  target-ppc: Fix PPC_DUMP_SPR_ACCESS build
  target-ppc: Synchronize FPU state with KVM
  target-ppc: Add mechanism for synchronizing SPRs with KVM
  Save memory allocation in the elf loader
  ...
---

fa3889162ff724d09eb6b6bd06ba54769100a77f