Git Repo - qemu.git/commit

author	Eduardo Habkost <[email protected]>
	Fri, 8 Jun 2018 19:29:40 +0000 (16:29 -0300)
committer	Eduardo Habkost <[email protected]>
	Mon, 11 Jun 2018 00:33:00 +0000 (21:33 -0300)
commit	1fb6752ecf87fb132035d3c03b0b9ca012265492
tree	30da4cf1cf93ef3e80440d63a1adc5b77c23ded7	tree \| snapshot
parent	8f4202fb1080f86958782b1fca0bf0279f67d136	commit \| diff

pc: Remove PC_COMPAT_2_12 from 3.0 machine-types

commit f548222c added PC_COMPAT_2_12 to the 3.0 PC machine-types.
I believe this happened during manual conflict resolution when
applying the patch.

Cc: Xiao Guangrong <[email protected]>
Cc: Juan Quintela <[email protected]>
Fixes: f548222c24342ca74689de7794f9006b43f86a54
Signed-off-by: Eduardo Habkost <[email protected]>
Message-Id: <20180608192940 [email protected]>
Reviewed-by: Marcel Apfelbaum<[email protected]>
Signed-off-by: Eduardo Habkost <[email protected]>

hw/i386/pc_piix.c		diff \| blob \| blame \| history
hw/i386/pc_q35.c		diff \| blob \| blame \| history