diff options
| author | Peter Maydell | 2017-04-18 17:18:15 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-04-18 17:18:15 +0200 |
| commit | d1263f8f1805ffe6a9da8520a6aa96062bc794f4 (patch) | |
| tree | c5fa1810e634b8bd725bd2eaafccffb4362c1552 /hw/timer/xilinx_timer.c | |
| parent | 9pfs: local: set the path of the export root to "." (diff) | |
| parent | block: Drain BH in bdrv_drained_begin (diff) | |
| download | qemu-d1263f8f1805ffe6a9da8520a6aa96062bc794f4.tar.gz qemu-d1263f8f1805ffe6a9da8520a6aa96062bc794f4.tar.xz qemu-d1263f8f1805ffe6a9da8520a6aa96062bc794f4.zip | |
Merge remote-tracking branch 'remotes/famz/tags/block-pull-request' into staging
# gpg: Signature made Tue 18 Apr 2017 15:58:32 BST
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/block-pull-request:
block: Drain BH in bdrv_drained_begin
block: Walk bs->children carefully in bdrv_drain_recurse
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/xilinx_timer.c')
0 files changed, 0 insertions, 0 deletions