summary refs log tree commit diff stats
path: root/hw/misc/omap_clk.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-08-14 15:51:24 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-08-14 15:51:24 +0100
commit8e0adf64140ab93aba79be2f0227a47eda78e464 (patch)
treef9de7df220b45ac9eb8dd8c2390dad874728b175 /hw/misc/omap_clk.c
parentbe1f13ac9d9fc21908975460652a72f5f0c018c5 (diff)
parent92e11a17612108b1729bde4ce61aad0cc1ce5889 (diff)
downloadfocaccia-qemu-8e0adf64140ab93aba79be2f0227a47eda78e464.tar.gz
focaccia-qemu-8e0adf64140ab93aba79be2f0227a47eda78e464.zip
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Fri 14 Aug 2015 15:41:14 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  throttle: add throttle_max_is_missing_limit() test
  throttle: refuse bps_max/iops_max without bps/iops

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/omap_clk.c')
0 files changed, 0 insertions, 0 deletions