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

[patchbot@xxxxxxx]

commit 838da99647a1123e59280b06c30d1c42002400dc
Merge: 7eb73add5de5839f160b902dd894d3aecc10ba0c 
006528196b81002a9c22e3e5c01a78542981ef60
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Thu Mar 13 13:58:27 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Mar 13 13:58:27 2014 +0000

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

 docs/misc/xen-command-line.markdown |   17 +++++++--
 xen/arch/arm/time.c                 |    2 +-
 xen/arch/x86/irq.c                  |    4 +-
 xen/arch/x86/mm.c                   |    4 +-
 xen/arch/x86/mm/hap/hap.c           |    4 ++-
 xen/arch/x86/mm/p2m-pod.c           |    6 ++-
 xen/arch/x86/mm/shadow/common.c     |    4 ++-
 xen/arch/x86/smpboot.c              |    4 +-
 xen/arch/x86/time.c                 |   10 ++++--
 xen/arch/x86/traps.c                |   14 ++++----
 xen/arch/x86/x86_64/compat/traps.c  |   14 ++++----
 xen/common/memory.c                 |    9 +++--
 xen/common/multicall.c              |    2 +-
 xen/drivers/char/console.c          |   69 +++++++++++++++++++++++++++++------
 xen/include/asm-arm/time.h          |    3 --
 xen/include/asm-x86/time.h          |    3 --
 xen/include/xen/time.h              |    1 +
 17 files changed, 117 insertions(+), 53 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