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

[patchbot@xxxxxxx]

commit 9b436680f081ae397e8c25ce2c23d3cd1359ce86
Merge: c87303c04738b0e837da6e891eb561de0bf1b64e 
9cf5f0affcab74a93e0beb9e64ade446d7d23e1b
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Tue Nov 24 16:50:27 2015 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Tue Nov 24 16:50:27 2015 +0000

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

 xen/arch/x86/x86_64/Makefile |    4 ++--
 xen/arch/x86/xen.lds.S       |    4 ++++
 xen/include/asm-x86/smp.h    |    1 -
 3 files changed, 6 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