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

[patchbot@xxxxxxx]

commit 30e3704323949387a8a52a4521e09f3279953732
Merge: a0eddd939d6e11e71a6fbfe4fe8329fd80194275 
836b363c55d4f3b2b9994a42d33cbbe09a024961
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Wed Apr 2 14:15:56 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Apr 2 14:15:56 2014 +0100

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

 xen/Rules.mk                 |    2 +-
 xen/arch/x86/boot/build32.mk |    2 +-
 xen/arch/x86/hvm/vmx/vmx.c   |    5 +++++
 xen/common/cpupool.c         |    2 +-
 xen/common/event_channel.c   |    2 +-
 xen/common/kimage.c          |    1 +
 xen/crypto/rijndael.c        |    3 +++
 xen/include/Makefile         |    4 ++--
 xen/include/xen/sched.h      |    9 ++++++---
 9 files changed, 21 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