From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 22 Dec 2017 00:11:36 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into... 
X-Git-Tag: v2.12.0-rc0~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=281f327487c9c9b1599f93c589a408bbf4a651b8;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.12-pull-request' into staging

# gpg: Signature made Thu 21 Dec 2017 19:35:00 GMT
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-2.12-pull-request:
  tests/boot-serial-test: Add support for the mcf5208evb board
  target/m68k: fix set_cc_op()
  target/m68k: add monitor.c
  target/m68k: remove unused variable gen_throws_exception
  Split adb.c into adb.c, adb-mouse.c and adb-kbd.c

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

281f327487c9c9b1599f93c589a408bbf4a651b8