diff options
| author | Peter Maydell | 2017-06-20 10:07:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-20 10:07:43 +0200 |
| commit | 5837aaac25e008ddafd1f12ddee78887e386c79d (patch) | |
| tree | 3560d7338bf5f0d42f4f8e671841d469c060da92 /scripts/switch-timer-api | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170614-1' into st... (diff) | |
| parent | block/iscsi: enable filename option and parsing (diff) | |
| download | qemu-5837aaac25e008ddafd1f12ddee78887e386c79d.tar.gz qemu-5837aaac25e008ddafd1f12ddee78887e386c79d.tar.xz qemu-5837aaac25e008ddafd1f12ddee78887e386c79d.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 14 Jun 2017 22:54:41 BST
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block/iscsi: enable filename option and parsing
block/rbd: enable filename option and parsing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/switch-timer-api')
0 files changed, 0 insertions, 0 deletions