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

[patchbot@xxxxxxx]

commit 1386ee2fc211b1c9cc245e6f56160fff03ead7ca
Merge: 9e14c516b6cbac4c676c988e577cea2ef78eebf6 
f3056b0fefc3c18990c281bc33de81c8046ab2f0
Author:     Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
AuthorDate: Thu Apr 11 13:18:40 2013 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Thu Apr 11 13:18:40 2013 +0100

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

 MAINTAINERS                               |   15 +-
 config/Tools.mk.in                        |    2 +
 tools/Makefile                            |    2 +
 tools/Rules.mk                            |    5 +-
 tools/blktap2/drivers/libaio-compat.h     |   12 +
 tools/config.h.in                         |    9 +
 tools/configure                           | 1519 +++++++++++++++++++++--------
 tools/configure.ac                        |   18 +-
 tools/libxc/xc_core.h                     |    2 +-
 tools/libxc/xenctrl.h                     |    4 +
 tools/memshr/bidir-hash.c                 |   48 +-
 tools/ocaml/libs/eventchn/xeneventchn.ml  |    8 +-
 tools/ocaml/libs/eventchn/xeneventchn.mli |   55 +-
 tools/ocaml/xenstored/Makefile            |   13 +-
 tools/ocaml/xenstored/domain.ml           |   28 +-
 tools/ocaml/xenstored/event.ml            |    6 +-
 tools/ocaml/xenstored/logging.ml          |  156 ++-
 tools/ocaml/xenstored/syslog.ml           |   47 +
 tools/ocaml/xenstored/syslog.mli          |   41 +
 tools/ocaml/xenstored/syslog_stubs.c      |   48 +
 tools/ocaml/xenstored/xenstored.ml        |    6 +-
 xen/arch/arm/arm32/entry.S                |    1 +
 xen/arch/arm/arm64/entry.S                |    1 +
 xen/arch/arm/domain.c                     |    8 +
 xen/arch/arm/domain_build.c               |    9 -
 xen/arch/arm/gic.c                        |   36 +-
 xen/arch/arm/mm.c                         |   10 +
 xen/arch/arm/setup.c                      |   13 +-
 xen/arch/arm/smpboot.c                    |    7 +-
 xen/arch/arm/traps.c                      |   13 +-
 xen/arch/arm/vgic.c                       |    6 +-
 xen/arch/arm/vtimer.c                     |   13 +-
 xen/arch/x86/cpu/mcheck/mce.c             |    9 +
 xen/arch/x86/irq.c                        |    9 +-
 xen/arch/x86/msi.c                        |   41 +-
 xen/arch/x86/time.c                       |    9 +
 xen/include/asm-arm/domain.h              |    4 +-
 xen/include/asm-arm/gic.h                 |    3 +
 xen/include/asm-arm/mm.h                  |    4 +-
 xen/include/asm-arm/processor.h           |    2 +
 xen/include/asm-arm/regs.h                |    6 +
 xen/include/asm-x86/msi.h                 |    4 +
 xen/include/public/arch-arm.h             |   30 +-
 xen/include/public/io/protocols.h         |    2 +-
 44 files changed, 1731 insertions(+), 553 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