diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-14 15:24:01 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-14 15:24:01 +0000 |
commit | 0dc8874aded76e2b6c73d95df5651e3c8a31a9ec (patch) | |
tree | 323eed70955857a817f86a0e21d1f5ca2fc40217 /chardev/char-pty.c | |
parent | 9895606363615a0d2a9554c9dadc7c57ec81f969 (diff) | |
parent | dcb556fc6ad879f7d29fb233a273a1ea3aa0549c (diff) | |
download | qemu-0dc8874aded76e2b6c73d95df5651e3c8a31a9ec.zip |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171114' into staging
ppc patch queue for 2017-11-14
Another couple of fixes for qemu-2.11.
# gpg: Signature made Tue 14 Nov 2017 04:36:20 GMT
# gpg: using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-2.11-20171114:
xics/kvm: synchonize state before 'info pic'
target/ppc: correct htab shift for hash on radix
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev/char-pty.c')
0 files changed, 0 insertions, 0 deletions