tree ba81dd99c4b379c58b3aa362bef351a319075281
parent d352210aede32743c6e7a8987c99196d84ab5471
parent 2b85cf0efd81a6190320e7b488a0a4bad9743cc3
author Anthony Liguori <aliguori@us.ibm.com> 1348607176 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1348607176 -0500

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