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

[patchbot@xxxxxxx]

commit da3bca931fbcf0cbdfec971aca234e7ec0f41e16
Merge: 7312c21dbd3f5026f087ba72c4e36754f1921762 
47f71a8ccb0c881cf3d9e0b917ef5f0dc084b062
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu May 23 14:23:32 2013 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu May 23 14:23:32 2013 +0100

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

 xen/arch/x86/apic.c     |    2 +-
 xen/arch/x86/efi/boot.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 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