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

[patchbot@xxxxxxx]

commit 2066ddd2327daeb2d92687ea2a88383f0b57a56c
Merge: 28ab9f3d0e7cbb22f5ce77500af7873f6e2d3c59 
13b5375fec56076a557772007e808cfdc579de58
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Fri Feb 19 18:31:30 2016 +0000
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Fri Feb 19 18:31:30 2016 +0000

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

 xen/arch/x86/Makefile              |  2 +-
 xen/arch/x86/Rules.mk              |  1 -
 xen/arch/x86/x86_64/compat/entry.S |  4 ++++
 xen/arch/x86/x86_64/entry.S        |  4 ++++
 xen/common/Kconfig                 | 13 +++++++++++++
 xen/common/Makefile                |  2 +-
 xen/include/asm-x86/config.h       |  1 -
 xen/include/asm-x86/xenoprof.h     | 21 +++++++++++++++++++++
 xen/include/xen/xenoprof.h         | 27 +++++++++++++++++++++------
 9 files changed, 65 insertions(+), 10 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