summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 20:15:05 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-06 20:15:05 -0800
commit403299a8515c56db58454c57712f4dc96d6c1fde (patch)
tree1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef /init
parentdaedd8708fe7707ed651bb1c83162f25c48a947c (diff)
parentfdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97 (diff)
Merge branch 'upstream/xen-settime' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions