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

[patchbot@xxxxxxx]

commit fcbfaf9d260adbdb9352d6300b9f63c4ed443d49
Merge: c43b206544b1ef9cfef630d03ca7bce5f9647876 
a622b5ade2bdf79ad95e6088a4041e75253c43f3
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Jun 16 12:42:27 2015 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Jun 16 12:42:27 2015 +0100

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

 tools/firmware/hvmloader/util.h  |    6 +-
 xen/arch/x86/domain_page.c       |   18 ----
 xen/common/event_channel.c       |   20 +++--
 xen/common/grant_table.c         |  170 ++++++++++++++++----------------------
 xen/common/memory.c              |   20 +++++
 xen/include/asm-arm/page.h       |    2 +
 xen/include/public/grant_table.h |    6 +-
 xen/include/xen/grant_table.h    |   10 --
 8 files changed, 114 insertions(+), 138 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