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

[patchbot@xxxxxxx]

commit 7f34f30abef53e3eee92cadc35253b80eeb48e56
Merge: 879b181f38b0e4e3c7314de980289f4ecd1c5982 
38007d325a4ddfa8da47e02ad01994eec96e9a06
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Mar 13 11:24:29 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Mar 13 11:24:29 2015 +0100

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

 Config.mk                |    6 +++---
 tools/libxl/xl_cmdimpl.c |    3 ++-
 2 files changed, 5 insertions(+), 4 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