diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-04 15:56:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-04 15:56:08 +0000 |
| commit | 88687719c8859bf98ed94ce91612608c99c51c1a (patch) | |
| tree | e193cc9693d2b7a1a683c59769285d3f72103d7e /net/netmap.c | |
| parent | 1ba530a4ecba6015d52d8f392fd327cfa07bc37a (diff) | |
| parent | cd38cc519b60bbe5dd8d85f6aaa72b2d7902930b (diff) | |
| download | focaccia-qemu-88687719c8859bf98ed94ce91612608c99c51c1a.tar.gz focaccia-qemu-88687719c8859bf98ed94ce91612608c99c51c1a.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2019-02-25-1' into staging
Merge tpm 2029/02/25 v1 # gpg: Signature made Mon 25 Feb 2019 15:05:12 GMT # gpg: using RSA key 75AD65802A0B4211 # gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown] # 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-2019-02-25-1: tpm_tis: convert tpm_tis_show_buffer() to use trace event tpm_tis: fix loop that cancels any seizure by a lower locality Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/netmap.c')
0 files changed, 0 insertions, 0 deletions