aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-30 10:00:45 -0700
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2009-03-30 10:00:45 -0700
commit1943689c47acaad7fc7f3dae8d35ef82de5d48f4 (patch)
tree881eee1afdc2b313288dadacb1eda1e56efc4331 /include/xen
parent6d02c42698f99eccb290ac53d4f10ca883b9f90c (diff)
parent0a4666b539a0e896ec4e8396a034a479e3573125 (diff)
parentc6a960ce8858f20036cc3afc3b9422670d0d9021 (diff)
parent818fd20673df82031e604bb784d836f1fc2e2451 (diff)
parentf0783708bf63a2827863cf2be57c08a24843e6bd (diff)
downloadmrst-s0i3-test-1943689c47acaad7fc7f3dae8d35ef82de5d48f4.tar.gz
mrst-s0i3-test-1943689c47acaad7fc7f3dae8d35ef82de5d48f4.tar.xz
mrst-s0i3-test-1943689c47acaad7fc7f3dae8d35ef82de5d48f4.zip
Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen/xenfs' and 'for-linus/xen/sys-hypervisor' into for-linus/xen/master
* for-linus/xen/dev-evtchn: xen/dev-evtchn: clean up locking in evtchn xen: export ioctl headers to userspace xen: add /dev/xen/evtchn driver xen: add irq_from_evtchn * for-linus/xen/xenbus: xen/xenbus: export xenbus_dev_changed xen: use device model for suspending xenbus devices xen: remove suspend_cancel hook * for-linus/xen/xenfs: xen: add "capabilities" file * for-linus/xen/sys-hypervisor: xen: drop kexec bits from /sys/hypervisor since kexec isn't implemented yet xen/sys/hypervisor: change writable_pt to features xen: add /sys/hypervisor support Conflicts: drivers/xen/Makefile