aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-12 15:46:43 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-12 15:46:43 +0000
commita822837d123183293f1cfc3167cc4e5255765915 (patch)
tree1ebd045d763e2e531e551b742844e1ff62bc5f37 /net
parent01ac27ce7f144e1768d8c0948a2789eb0f109928 (diff)
parent84f3fe1b077a06ca50f85fa3ff696a8fe094623b (diff)
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Tracing pull request # gpg: Signature made Wed 12 Mar 2014 13:20:10 GMT using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.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: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: trace: Fix build warnings for Win32 build Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions