From: Peter Maydell <peter.maydell@linaro.org>
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: v2.5.0-rc0~88
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=006d5c741bbfcdbedeb59e14527fe58d45c9c76b;p=users%2Fdwmw2%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) <jsnow@redhat.com>"

* 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 <peter.maydell@linaro.org>
---

006d5c741bbfcdbedeb59e14527fe58d45c9c76b