diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2016-10-07 14:17:11 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-10-07 14:17:11 +0200 |
| commit | 9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8 (patch) | |
| tree | efe15b0952ffe7eeec72c103479ca77d6a422837 /include/sysemu/char.h | |
| parent | 2d76e724cf9e3f9fec6070a8af79c7ee4c2e763e (diff) | |
| parent | 27685a8dd08c051fa6d641fe46106fc0dfa51073 (diff) | |
| download | qemu-9c7f3fcae714925153c4c5ada086ca4fcf6bbbd8.tar.gz | |
Merge remote-tracking branch 'mreitz/tags/pull-block-2016-10-07' into queue-block
Block patches for the block queue.
# gpg: Signature made Fri Oct 7 14:14:45 2016 CEST
# 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
* mreitz/tags/pull-block-2016-10-07:
dmg: Move libbz2 code to dmg-bz2.so
module: Don't load the same module if requested multiple times
scripts: Allow block module to not define BlockDriver
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/sysemu/char.h')
0 files changed, 0 insertions, 0 deletions