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

[patchbot@xxxxxxx]

commit 208ae82a265c065b7f39ca38b4ba25c14d2df0f0
Merge: f0dbdc628a0ecdc44d6afab28a9d5a52c996eec5 
1e50b51dc5e9594975ccc060dd58bc35873911bc
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Apr 24 13:02:48 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Apr 24 13:02:48 2014 +0100

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

 xen/arch/x86/mm/hap/hap.c      |    4 +---
 xen/arch/x86/mm/p2m.c          |   14 ++++----------
 xen/arch/x86/mm/shadow/multi.c |    7 ++-----
 3 files changed, 7 insertions(+), 18 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