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

[patchbot@xxxxxxx]

commit 38007d325a4ddfa8da47e02ad01994eec96e9a06
Merge: cde92647ea4f5c487059a3c89f2e3f1aec9a42d3 
91b0ae9db33f72468b1d411a07f53085c893c097
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Mar 13 10:22:48 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Fri Mar 13 10:22:48 2015 +0000

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

 tools/blktap2/drivers/tapdisk-vbd.c |    2 +-
 tools/libxl/libxl_dm.c              |   21 +++++++++++++++++++--
 xen/include/Makefile                |    3 +--
 xen/include/public/io/ring.h        |    4 ++--
 4 files changed, 23 insertions(+), 7 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