summary refs log tree commit diff stats
path: root/include/standard-headers/linux/input-event-codes.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-09-29 10:29:46 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-09-29 10:29:46 +0100
commit23290e8070fa18dd8ff930515326e76eeee5810a (patch)
tree46313aa833315afb1f52a225711a385a7d4d76cd /include/standard-headers/linux/input-event-codes.h
parent1553d543ff4b9f91de4ed7743f0cd6e534528b9e (diff)
parent1783c00fc998220f9ca13b7eeca1d610243bc11b (diff)
downloadfocaccia-qemu-23290e8070fa18dd8ff930515326e76eeee5810a.tar.gz
focaccia-qemu-23290e8070fa18dd8ff930515326e76eeee5810a.zip
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20200928a' into staging
Migration: Revert one patch for 068 fix

One patch in the last pull broke test 068 which
does a pair of vmload's.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Mon 28 Sep 2020 16:19:17 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20200928a:
  Revert "migration: Properly destroy variables on incoming side"

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/standard-headers/linux/input-event-codes.h')
0 files changed, 0 insertions, 0 deletions