From: Peter Maydell Date: Tue, 28 Apr 2015 11:22:20 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~222 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84cbd63f87c1d246f51ec8eee5367a5588f367fd;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging X86 queue, 2015-04-27 (v2) # gpg: Signature made Mon Apr 27 19:42:39 2015 BST using RSA key ID 984DC5A6 # gpg: Good signature from "Eduardo Habkost " # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6 * remotes/ehabkost/tags/x86-pull-request: target-i386: Remove AMD feature flag aliases from CPU model table target-i386: X86CPU::xlevel2 QOM property target-i386: Make "level" and "xlevel" properties static qemu-config: Accept empty option values MAINTAINERS: Change status of X86 to Maintained MAINTAINERS: Add myself to X86 Signed-off-by: Peter Maydell --- 84cbd63f87c1d246f51ec8eee5367a5588f367fd