From: Peter Maydell Date: Thu, 2 Apr 2015 13:36:57 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-hw-2015-04-02' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=913fbe9a6a05296132b5fab431bf1c377a0bbf1a;p=qemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-hw-2015-04-02' into staging hw: Contain drive, serial, parallel, net misuse # gpg: Signature made Thu Apr 2 14:32:00 2015 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-hw-2015-04-02: sysbus: Make devices picking up backends unavailable with -device sdhci: Make device "sdhci-pci" unavailable with -device hw: Mark device misusing nd_table[] FIXME hw: Mark devices picking up char backends actively FIXME hw: Mark devices picking up block backends actively FIXME Signed-off-by: Peter Maydell --- 913fbe9a6a05296132b5fab431bf1c377a0bbf1a