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

[patchbot@xxxxxxx]

commit beb0975bcfd49d0ddd89267af8860c520d2db251
Merge: 592d3ef961cafda917a7f123999dc04d426254ee 
9be8a4447103d92843fcfeaad8be42408c90e9a9
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Mon Apr 22 12:59:26 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Apr 22 12:59:26 2013 +0100

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

 xen/arch/x86/efi/boot.c       |   26 ++++++++++++++++++++++++++
 xen/arch/x86/efi/efi.h        |    3 +++
 xen/arch/x86/efi/runtime.c    |   36 ++++++++++++++++++++++++++++++++++++
 xen/include/efi/efiapi.h      |    4 ++++
 xen/include/efi/efierr.h      |    7 +++++++
 xen/include/public/platform.h |    1 +
 6 files changed, 77 insertions(+), 0 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