From: Peter Maydell Date: Mon, 7 Apr 2014 16:57:23 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=55519a4b244e4822774b593e36647ecf7598286b;p=qmiga%2Fqemu.git Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging QOM/QTest infrastructure fixes * Relicensing of FWPathProvider interface * Clean up all targets' qtests # gpg: Signature made Mon 07 Apr 2014 17:56:13 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/qom-devices-for-2.0: tests: Update check-clean rule fw-path-provider: Change GPL version to 2+ Signed-off-by: Peter Maydell --- 55519a4b244e4822774b593e36647ecf7598286b