Merge commit '671e4676076fb62860986decd44440d97bcc872d' into upstream-merge
commit6421a1ce48f03a63c3fcf32ee0300655fcb1d8fb
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 10:12:01 +0000 (30 13:12 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 10:12:01 +0000 (30 13:12 +0300)
tree491562ddaea8ea1a0d5151e8f48ac7b191fa86b5
parentdc090bec2ad897a102f1b652b5af34d7f278ea2a
parent671e4676076fb62860986decd44440d97bcc872d
Merge commit '671e4676076fb62860986decd44440d97bcc872d' into upstream-merge

* commit '671e4676076fb62860986decd44440d97bcc872d':
  remove CPUID host hacks

Conflicts:
target-i386/helper.c

Signed-off-by: Avi Kivity <avi@redhat.com>
target-i386/helper.c