Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into... master github/master
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 22 Sep 2017 15:15:23 +0000 (16:15 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 22 Sep 2017 15:15:23 +0000 (16:15 +0100)
commitc348b54ab5c3e6c80fbf365b671974fd92f39113
tree59fd526043b91a48f6d9d0c1203c2dded9f1fbb8
parentbef81b3eb521f2825d85b8ddf246c81a28dcef35
parentad904f6689f1ced282b413cb904c166f294a73ee
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging

Python queue, 2017-09-22

* MAINTAINERS update
* Fix logging issue on test scripts using qemu.py

# gpg: Signature made Fri 22 Sep 2017 15:41:43 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/python-next-pull-request:
  MAINTAINERS: Add Python scripts
  qemu.py: Call logging.basicConfig() automatically

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
MAINTAINERS
scripts/qemu.py