]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Jul 2014 12:16:04 +0000 (13:16 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 22 Jul 2014 12:16:04 +0000 (13:16 +0100)
commitb64c670f1ddcd02d003e701f69cf573d7c559ecb
tree9754e1eb3dcb878ee7d959fed7f786d6dbfca67b
parent25af8e6b6106f47f5ee276545fcab47cefa67ba1
parent713e8a102222b6b8ca65050d13b287f5705831b0
Merge remote-tracking branch 'remotes/amit-virtio-rng/for-2.1' into staging

* remotes/amit-virtio-rng/for-2.1:
  virtio-rng: Add human-readable error message for negative max-bytes parameter

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>