1
linux/drivers/xen
Jeremy Fitzhardinge 1943689c47 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
2009-03-30 10:00:45 -07:00
..
xenbus xen/xenbus: export xenbus_dev_changed 2009-03-30 09:26:56 -07:00
xenfs xen: add "capabilities" file 2009-03-30 09:59:20 -07:00
balloon.c xen: make sysfs files behave as their names suggest 2009-01-29 13:20:36 +01:00
cpu_hotplug.c x86, um: ... and asm-x86 move 2008-10-22 22:55:20 -07:00
events.c xen: add irq_from_evtchn 2009-03-30 09:26:49 -07:00
evtchn.c xen/dev-evtchn: clean up locking in evtchn 2009-03-30 09:26:49 -07:00
features.c xen: clean up asm/xen/hypervisor.h 2008-12-16 21:50:31 +01:00
grant-table.c xen: clean up asm/xen/hypervisor.h 2008-12-16 21:50:31 +01:00
Kconfig 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 2009-03-30 10:00:45 -07:00
Makefile 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 2009-03-30 10:00:45 -07:00
manage.c xen: use device model for suspending xenbus devices 2009-03-30 09:26:56 -07:00
sys-hypervisor.c xen: drop kexec bits from /sys/hypervisor since kexec isn't implemented yet 2009-03-30 09:27:07 -07:00
xencomm.c xen: portability clean up and some minor clean up for xencomm.c 2008-10-23 21:54:36 +02:00