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

[patchbot@xxxxxxx]

commit 47a1d0b48ce3010c1b119541353cb1a7b5ed5de9
Merge: b53f25e319d2d862b889260ccff6c8baea664a21 
d0f535e9af564642250badf1fa300725ef996616
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Jun 26 17:22:45 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Jun 26 17:22:45 2013 +0100

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

 tools/hotplug/Linux/xen-hotplug-common.sh |    1 +
 xen/arch/x86/domain.c                     |   27 +++++++++++++++++++++------
 xen/arch/x86/mm.c                         |    9 ++++++---
 xen/include/asm-x86/mm.h                  |    1 +
 4 files changed, 29 insertions(+), 9 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