From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 1 Feb 2013 01:37:33 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber/qom-cpu' into staging
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~59^2~944
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu:
  linux-user: bsd-user: Don't reset X86CPU twice
  target-i386: Pass X86CPU to cpu_x86_set_a20()
  target-unicore32: Rename CPU subtypes
  target-openrisc: Rename CPU subtypes
  target-openrisc: TYPE_OPENRISC_CPU should be abstract
  target-m68k: Rename CPU subtypes
  target-m68k: Mark as unmigratable
  target-s390x: Mark as unmigratable
  target-sh4: Mark as unmigratable
  target-xtensa: Mark as unmigratable
  target-microblaze: Mark as unmigratable
  target-unicore32: Mark as unmigratable
  ide/mmio: QOM'ify MMIO IDE for R2D
---

8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e