diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-14 14:55:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-14 14:55:25 +0100 |
| commit | 3e7cac31d6079b1642321bd8bab8ca8e0f431929 (patch) | |
| tree | fbdc0821d33ddcc1190deffc67222c98dca22fae /block.c | |
| parent | 33e570288985611345c7d6e073a4b258c97573a8 (diff) | |
| parent | 01310e2aa7ad87f101d56feb8c06898084c9b542 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
tpm, vhost, virtio: fixes for 2.6
Minor fixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Thu 14 Apr 2016 14:45:55 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
* remotes/mst/tags/for_upstream:
hw/virtio/balloon: Replace TARGET_PAGE_SIZE with BALLOON_PAGE_SIZE
tpm: Fix write to file descriptor function
tpm: acpi: remove IRQ from TPM's CRS to make Windows not see conflict
pc: acpi: tpm: add missing MMIO resource to PCI0._CRS
specs/vhost-user: spelling fix
specs/vhost-user: improve VHOST_SET_VRING_NUM documentation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block.c')
0 files changed, 0 insertions, 0 deletions