summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-07 17:57:23 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-07 17:57:23 +0100
commit55519a4b244e4822774b593e36647ecf7598286b (patch)
treed8f8b7253fa29b7402137b16954a258a4ab5d948 /Makefile
parent9c269f6d7bfb81cbbf501576b979831478dac5d9 (diff)
parentf85e3457cea170b5a0c48e9aa67d316f9e3cbcba (diff)
downloadqemu-55519a4b244e4822774b593e36647ecf7598286b.tar.gz
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 <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * 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 <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions