[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging

[patchbot@xxxxxxx]

commit d93b1fb009b64333d324a2fe76fe805f2ac2cda4
Merge: ad538782d78e46878d1c1cb24582d51bd266c626 
d4f7ca59017835784c6872dfab0e269d9b41b05a
Author:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
AuthorDate: Fri Nov 18 15:24:26 2016 +0000
Commit:     Stefan Hajnoczi <stefanha@xxxxxxxxxx>
CommitDate: Fri Nov 18 15:24:26 2016 +0000

    Merge remote-tracking branch 'public/tags/tracing-pull-request' into staging
    
    # gpg: Signature made Fri 18 Nov 2016 03:01:22 PM GMT
    # gpg:                using RSA key 0x9CA4ABB381AB73C8
    # gpg: Good signature from "Stefan Hajnoczi <stefanha@xxxxxxxxxx>"
    # gpg:                 aka "Stefan Hajnoczi <stefanha@xxxxxxxxx>"
    # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 
73C8
    
    * public/tags/tracing-pull-request:
      trace: fix generated code build break
    
    Message-id: 1479481289-2479-1-git-send-email-stefanha@xxxxxxxxxx
    Signed-off-by: Stefan Hajnoczi <stefanha@xxxxxxxxxx>

 scripts/tracetool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog