]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge tag 'qom-cpu-for-1.5' into stable-1.5-staging
authorMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 13 Aug 2013 18:09:23 +0000 (13:09 -0500)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 13 Aug 2013 18:10:17 +0000 (13:10 -0500)
QOM CPUState and X86CPU for stable-1.5

* Fix X86CPU Westmere CPUID for pc-*-1.4 and older

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Trivial merge