summaryrefslogtreecommitdiffstats
path: root/hw/net/mcf_fec.c
diff options
context:
space:
mode:
authorPeter Maydell2017-04-11 15:53:32 +0200
committerPeter Maydell2017-04-11 15:53:33 +0200
commitf5ac5cfeb67c31c2938419e71572d1cee2f9dd5e (patch)
tree4a9a1f180a593ff5a930250641862fcdea063c82 /hw/net/mcf_fec.c
parentMerge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging (diff)
parentiscsi: Fix iscsi_create (diff)
downloadqemu-f5ac5cfeb67c31c2938419e71572d1cee2f9dd5e.tar.gz
qemu-f5ac5cfeb67c31c2938419e71572d1cee2f9dd5e.tar.xz
qemu-f5ac5cfeb67c31c2938419e71572d1cee2f9dd5e.zip
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-04-11' into staging
Block patches for 2.9.0-rc4 # gpg: Signature made Tue 11 Apr 2017 14:40:07 BST # gpg: using RSA key 0xF407DB0061D5CF40 # gpg: Good signature from "Max Reitz <mreitz@redhat.com>" # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40 * remotes/maxreitz/tags/pull-block-2017-04-11: iscsi: Fix iscsi_create throttle: Remove block from group on hot-unplug block: pass the right options for BlockDriver.bdrv_open() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/mcf_fec.c')
0 files changed, 0 insertions, 0 deletions