From: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Date: Mon, 30 Mar 2009 17:00:45 +0000 (-0700)
Subject: Merge branches 'for-linus/xen/dev-evtchn', 'for-linus/xen/xenbus', 'for-linus/xen... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1943689c47acaad7fc7f3dae8d35ef82de5d48f4;p=linux-beck.git

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
---

1943689c47acaad7fc7f3dae8d35ef82de5d48f4
diff --cc drivers/xen/Makefile
index ff8accc9e103,1567639847e7,ff8accc9e103,ff8accc9e103,f3603a39db55..ec2a39b1e26f
--- a/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