From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 19 Dec 2017 12:48:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=062fcb27c4c1af6902f497ec9316c1c0ead90e81;p=qemu.git

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into staging

Merge tpm 2017/12/19 v1

# gpg: Signature made Tue 19 Dec 2017 11:51:13 GMT
# gpg:                using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE  C66B 75AD 6580 2A0B 4211

* remotes/stefanberger/tags/pull-tpm-2017-12-19-1:
  tpm: move qdev_prop_tpm to hw/tpm/

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

062fcb27c4c1af6902f497ec9316c1c0ead90e81