From: Anthony Liguori Date: Tue, 19 Nov 2013 20:59:48 +0000 (-0800) Subject: Merge remote-tracking branch 'mst/tags/for_anthony' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~524^2~3^2~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4be6693a8842023542d1ae1c6e4e2a3fd9988ebe;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'mst/tags/for_anthony' into staging pc last minute fixes for 1.8 This has a patch that drops an unused FW CFG entry. I think it's best to include it before 1.7 to avoid the need to maintain it in compat machine types. There's also a doc bugfix by Amos: I'm guessing doc fixes are still fair game even at this late stage. Signed-off-by: Michael S. Tsirkin # gpg: Signature made Mon 18 Nov 2013 03:48:14 AM PST using RSA key ID D28D5469 # gpg: Can't check signature: public key not found # By Amos Kong (1) and Igor Mammedov (1) # Via Michael S. Tsirkin * mst/tags/for_anthony: doc: fix hardcoded helper path pc: disable pci-info Message-id: 1384775449-6693-1-git-send-email-mst@redhat.com Signed-off-by: Anthony Liguori --- 4be6693a8842023542d1ae1c6e4e2a3fd9988ebe