diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 16:58:16 +0100 |
| commit | 50104f5ac537eecc890c65e99362df47bac3f9d9 (patch) | |
| tree | f80ef7933fc3f4e43ccb11f24d7b98a93656e89a /ui/input-keymap.c | |
| parent | ce1d20aac8533357650774c2c240e30de87dc122 (diff) | |
| parent | 2c93c5cb43fd992038711f84ea34c9373273cda6 (diff) | |
| download | focaccia-qemu-50104f5ac537eecc890c65e99362df47bac3f9d9.tar.gz focaccia-qemu-50104f5ac537eecc890c65e99362df47bac3f9d9.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc0 # gpg: Signature made Mon 24 Jul 2017 15:16:42 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: qemu-iotests: Avoid unnecessary sleeps block: Skip implicit nodes in query-block/blockstats qcow2: Fix sector calculation in qcow2_measure() dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented iotests: Remove a few tests from 'quick' group Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-keymap.c')
0 files changed, 0 insertions, 0 deletions