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

[patchbot@xxxxxxx]

commit ce6ce4a8a88fa7930838fc9fa06300bc43713671
Merge: a08b914807b14a8328d005079d774e7f8efd1d24 
afba7c6d9566f1556117b78e767f9678433a1f01
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Jul 22 15:55:14 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Jul 22 15:55:14 2015 +0100

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

 tools/libxl/libxl_psr.c    |    6 +++---
 xen/arch/x86/mm/paging.c   |    2 +-
 xen/arch/x86/psr.c         |    8 ++++----
 xen/common/domain.c        |    4 ++--
 xen/common/hvm/save.c      |    2 +-
 xen/include/public/errno.h |   12 +++++++-----
 6 files changed, 18 insertions(+), 16 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