[Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging

[patchbot@xxxxxxx]

commit 54b671170057d63a8eb508ec81ffd83e6195b99b
Merge: 8672aa8384d18690df62b2cff2627590e93b0359 
8da1ed9031341381c218b7e6eaab5b4f239a327b
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Dec 20 09:53:14 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Dec 20 09:53:14 2013 +0000

    Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into 
staging

 Config.mk                |    8 ++++----
 tools/libxl/xl_cmdimpl.c |    2 +-
 tools/xenstore/xs.c      |    6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog