diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-04 17:19:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-04 17:19:04 +0000 |
| commit | 2a4c7e839101a52f7bf9ba4dd64e466518565352 (patch) | |
| tree | af320e36bd9bcaccf85fe6ff0149524674093fdd /ui/input-keymap.c | |
| parent | e80a25611c67a93947ae99f4057b850410a54497 (diff) | |
| parent | 3d5d319e1221082974711af1d09d82f0755c1698 (diff) | |
| download | focaccia-qemu-2a4c7e839101a52f7bf9ba4dd64e466518565352.tar.gz focaccia-qemu-2a4c7e839101a52f7bf9ba4dd64e466518565352.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.11.0-rc4 # gpg: Signature made Mon 04 Dec 2017 16:46:07 GMT # 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: blockjob: Make block_job_pause_all() keep a reference to the jobs Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-keymap.c')
0 files changed, 0 insertions, 0 deletions