[Qemu-devel] [PULL v1] Merge tpm 2017/12/19

[Stefan Berger]

The patch in this pull request fixes a linker error when --disable-tpm is used.

   Stefan

The following changes since commit eaefea537b476cb853e2edbdc68e969ec777e4bb:

  Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into 
staging (2017-12-18 14:17:42 +0000)

are available in the git repository at:

  git://github.com/stefanberger/qemu-tpm.git tags/pull-tpm-2017-12-19-1

for you to fetch changes up to 89be9e99c83095af25ce16907143c31f2959188b:

  tpm: move qdev_prop_tpm to hw/tpm/ (2017-12-19 06:40:04 -0500)

----------------------------------------------------------------
Merge tpm 2017/12/19 v1

----------------------------------------------------------------
Cornelia Huck (1):
      tpm: move qdev_prop_tpm to hw/tpm/

 hw/core/qdev-properties-system.c | 64 
--------------------------------------------------------------
 hw/tpm/Makefile.objs             |  5 +++--
 hw/tpm/tpm_util.c                | 67 
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/tpm/tpm_util.h                |  3 +++
 include/hw/qdev-properties.h     |  2 --
 5 files changed, 73 insertions(+), 68 deletions(-)

-- 
2.5.5