Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen...

* 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

diff --cc drivers/xen/Kconfig
Simple merge

diff --cc drivers/xen/Makefile
index ff8accc,1567639,ff8accc,ff8accc,f3603a3..ec2a39b
--- 1/drivers/xen/Makefile
--- 2/drivers/xen/Makefile
--- 3/drivers/xen/Makefile
--- 4/drivers/xen/Makefile
--- 5/drivers/xen/Makefile
+++ b/drivers/xen/Makefile
@@@@@@ -4,4 -4,5 -4,4 -4,4 -4,5 +4,6 @@@@@@ obj-y       += xenbus
     obj-$(CONFIG_HOTPLUG_CPU)  += cpu_hotplug.o
     obj-$(CONFIG_XEN_XENCOMM)  += xencomm.o
     obj-$(CONFIG_XEN_BALLOON)  += balloon.o
- -- obj-$(CONFIG_XENFS)                += xenfs/
+ +++obj-$(CONFIG_XEN_DEV_EVTCHN)       += evtchn.o
+ ++ obj-$(CONFIG_XENFS)                += xenfs/
    -obj-$(CONFIG_XEN_SYS_HYPERVISOR)   += sys-hypervisor.o
+++++obj-$(CONFIG_XEN_SYS_HYPERVISOR)   += sys-hypervisor.o