Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel...
commit403299a8515c56db58454c57712f4dc96d6c1fde
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 04:15:05 +0000 (6 20:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 04:15:05 +0000 (6 20:15 -0800)
tree1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef
parentdaedd8708fe7707ed651bb1c83162f25c48a947c
parentfdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97
Merge branch 'upstream/xen-settime' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/xen-settime' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/dom0: set wallclock time in Xen
  xen: add dom0_op hypercall
  xen/acpi: Domain0 acpi parser related platform hypercall
arch/x86/include/asm/xen/hypercall.h
arch/x86/xen/time.c
include/xen/interface/xen.h