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

[patchbot@xxxxxxx]

commit 6c7fa05f312d711370d396c597fdf7c13189cc4b
Merge: 4e96e50c36fe32aa3e5d5da370f58da89fd35cb3 
beb0975bcfd49d0ddd89267af8860c520d2db251
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Apr 22 14:02:16 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Apr 22 14:02:16 2013 +0200

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

 extras/mini-os/arch/x86/x86_64.S             |  245 ++++++++++++++++----------
 stubdom/Makefile                             |    2 +-
 tools/libxc/Makefile                         |    8 +
 tools/libxc/xc_dom_bzimageloader.c           |   11 ++
 tools/libxc/xc_dom_decompress_unsafe.c       |   48 +++++
 tools/libxc/xc_dom_decompress_unsafe.h       |   20 ++
 tools/libxc/xc_dom_decompress_unsafe_bzip2.c |   14 ++
 tools/libxc/xc_dom_decompress_unsafe_lzma.c  |   14 ++
 tools/libxc/xc_dom_decompress_unsafe_lzo1x.c |   49 +++++
 tools/libxc/xc_dom_decompress_unsafe_xz.c    |   57 ++++++
 xen/arch/arm/domain.c                        |    5 +-
 xen/arch/arm/gic.c                           |    9 +-
 xen/common/decompress.h                      |   13 ++
 xen/common/lzo.c                             |    3 +
 xen/common/unlzma.c                          |    2 +
 xen/common/unlzo.c                           |    3 +
 xen/common/xz/private.h                      |    3 +
 17 files changed, 410 insertions(+), 96 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