From: Peter Maydell Date: Tue, 6 Oct 2015 11:09:56 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~121^2~1^2~150 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=006d5c741bbfcdbedeb59e14527fe58d45c9c76b;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging # gpg: Signature made Mon 05 Oct 2015 17:01:11 BST using RSA key ID AAFC390E # gpg: Good signature from "John Snow (John Huston) " * remotes/jnsnow/tags/ide-pull-request: qtest/ide-test: ppc64be correction for ATAPI tests MAINTAINERS: Small IDE/FDC touchup qtest/ahci: fix redundant assertion Signed-off-by: Peter Maydell --- 006d5c741bbfcdbedeb59e14527fe58d45c9c76b