From: Peter Maydell Date: Fri, 14 Aug 2015 14:51:24 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~120^2~1^2~246 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e0adf64140ab93aba79be2f0227a47eda78e464;p=sdk%2Femulator%2Fqemu.git 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 " # gpg: aka "Stefan Hajnoczi " * 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 --- 8e0adf64140ab93aba79be2f0227a47eda78e464