diff options
| author |   Peter Maydell <peter.maydell@linaro.org> | 2015-07-14 16:51:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-14 16:51:44 +0100 |
| commit | f3947986d9bbbae1087c4c33880d3f8dbf1f1384 (patch) | |
| tree | f497dabaf32b08d65d298c67ec0d74f67d6b17a2 /hw/misc/omap_clk.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150714-1' into staging (diff) | |
| parent | rbd: fix ceph settings precedence (diff) | |
| download | qemu-f3947986d9bbbae1087c4c33880d3f8dbf1f1384.tar.xz qemu-f3947986d9bbbae1087c4c33880d3f8dbf1f1384.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.4.0-rc1
# gpg: Signature made Tue Jul 14 16:15:35 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
rbd: fix ceph settings precedence
rbd: make qemu's cache setting override any ceph setting
MAINTAINERS: update email address
rbd: remove unused constants and fields
block: Fix backing file child when modifying graph
block: Reorder cleanups in bdrv_close()
block: Introduce bdrv_unref_child()
block: Introduce bdrv_open_child()
block: Move bdrv_attach_child() calls up the call chain
nvme: properly report volatile write caches
nvme: implement the Flush command
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/omap_clk.c')
0 files changed, 0 insertions, 0 deletions