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

[patchbot@xxxxxxx]

commit d85728a3c5e112383e99fc23825fd238a4fb8c63
Merge: 8f4023dd7d77de7b2c1af77e86637202a33f948a 
13f72e92a32380e94cb0c86725a1b38a6d191461
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Nov 25 16:24:19 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Nov 25 16:24:19 2014 +0000

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

 tools/libxc/include/xenctrl.h |    2 +-
 tools/libxc/xc_domain.c       |    2 +-
 xen/common/domctl.c           |    2 +-
 xen/common/memory.c           |    4 ++--
 xen/include/public/domctl.h   |    2 +-
 xen/include/public/memory.h   |   15 +++++++--------
 xen/include/xen/domain.h      |    2 +-
 7 files changed, 14 insertions(+), 15 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