summary refs log tree commit diff stats
path: root/scripts/tracetool/backend/ftrace.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-28 14:20:17 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-28 14:20:17 +0100
commit762971738c1857ab83ff68d0429bcca066e2dfb2 (patch)
tree4dbe4fba48b46d63e5a0b145bce81138209ce47c /scripts/tracetool/backend/ftrace.py
parent871a0f7ad2b9560c5f7d640125c5be95ca23ca7f (diff)
parentef58430d5daeac4c18e4072f5860e25700aa8af6 (diff)
downloadfocaccia-qemu-762971738c1857ab83ff68d0429bcca066e2dfb2.tar.gz
focaccia-qemu-762971738c1857ab83ff68d0429bcca066e2dfb2.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170728-pull-request' into staging
ui: more keymap fixes for 2.10

# gpg: Signature made Fri 28 Jul 2017 13:59:01 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20170728-pull-request:
  ui: add pause key to linux_to_qcode
  ui: drop ac_search and ac_stop
  ui: correctly detect spice PAUSE scancode sequence

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/backend/ftrace.py')
0 files changed, 0 insertions, 0 deletions