Merge commit 'c1a54d573bae6c597eaa3c9ca6135930c5cd5215' into upstream-merge
commit5ec08b1166806907f79fa2dcd1017014eb2af6eb
authorAvi Kivity <avi@redhat.com>
Mon, 5 Oct 2009 16:34:22 +0000 (5 18:34 +0200)
committerAvi Kivity <avi@redhat.com>
Mon, 5 Oct 2009 16:34:22 +0000 (5 18:34 +0200)
tree1fcbeea67858a8a530696c0f396f4df0b7f5009a
parent38252c229184b1116620db564fb056e2ee0c26f8
parentc1a54d573bae6c597eaa3c9ca6135930c5cd5215
Merge commit 'c1a54d573bae6c597eaa3c9ca6135930c5cd5215' into upstream-merge

* commit 'c1a54d573bae6c597eaa3c9ca6135930c5cd5215':
  x86: split MTRRVar union

Conflicts:
target-i386/cpu.h

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