From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 25 Sep 2012 21:06:16 +0000 (-0500)
Subject: Merge remote-tracking branch 'afaerber/qom-cpu' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=97fe81d3e8613be13754ff096c16b73010fd60ad;p=qemu.git

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

* afaerber/qom-cpu:
  target-alpha: Initialize env->cpu_model_str
  target-i386: Drop unused setscalar() macro
  target-i386: Kill cpudef config section support
  target-i386: x86_cpudef_setup() coding style change
  Eliminate cpus-x86_64.conf file
  target-i386: Move CPU models from cpus-x86_64.conf to C
  target-i386: Add missing CPUID_* constants
  Drop cpu_list_id macro
  target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump
  MAINTAINERS: Add entry for QOM CPU
---

97fe81d3e8613be13754ff096c16b73010fd60ad