From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 24 Oct 2017 11:03:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20171023-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9293fcfe253d29899e370ccf172a76b7eca49aac;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20171023-pull-request' into staging

fixes for the fallout of the recent ui and keymap merges.

# gpg: Signature made Mon 23 Oct 2017 09:02:24 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/fixes-20171023-pull-request:
  scripts: don't throw away stderr when checking out git submodules
  ui: add qemu-keymap and shader to .gitignore
  configure: disable qemu-keymap for linux-user qemu

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9293fcfe253d29899e370ccf172a76b7eca49aac