| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 7 Nov 2011 04:15:05 +0000 (20:15 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 7 Nov 2011 04:15:05 +0000 (20:15 -0800) |
* '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
xen/dom0: set wallclock time in Xen
xen: add dom0_op hypercall
xen/acpi: Domain0 acpi parser related platform hypercall
| 1 | 2 | |||
|---|---|---|---|---|
| arch/x86/include/asm/xen/hypercall.h | patch | | diff1 | | diff2 | | blob | history |
| arch/x86/xen/time.c | patch | | diff1 | | diff2 | | blob | history |
| include/xen/interface/xen.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/include/asm/xen/hypercall.h
Simple merge
diff --cc arch/x86/xen/time.c
Simple merge
diff --cc include/xen/interface/xen.h
Simple merge