From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 14 May 2012 15:15:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging
X-Git-Tag: qemu-xen-4.3.0-rc1~1083
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8592d5259a2be71fdca45fc0db62a5ad10abe9f5;p=qemu-upstream-4.4-testing.git

Merge remote-tracking branch 'afaerber-or/qom-1.1' into staging

* afaerber-or/qom-1.1:
  mips_fulong2e: Don't register "cpu" VMState twice
  pc: Add back PCI.rombar compat property
  qdev: Fix adding of ptr properties
  qdev: Use object_property_print() in info qtree
  target-i386: Defer MCE init
  qom: Documentation addition for object_class_by_name()
  target-mips: Remove commented-out function declaration
---

8592d5259a2be71fdca45fc0db62a5ad10abe9f5