From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 20 Jul 2017 11:04:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' into... 
X-Git-Tag: v2.10.0-rc0~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' into staging

git orderfile and editorconfig for 2.10

# gpg: Signature made Thu 20 Jul 2017 09:00: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/misc-20170720-pull-request:
  add editorconfig
  add scripts/git.orderfile

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

8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283