From: Maxim Uvarov <maxim.uvarov@oracle.com>
Date: Fri, 29 Jun 2012 08:39:20 +0000 (-0700)
Subject: Merge branch 'kexec-v3' of git://ca-git.us.oracle.com/linux-dkiper-public
X-Git-Tag: v2.6.39-400.9.0~514
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=052c9c29a384f35e741438888d1adde976d9727b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'kexec-v3' of git://ca-git.us.oracle.com/linux-dkiper-public
---

052c9c29a384f35e741438888d1adde976d9727b
diff --cc drivers/xen/sys-hypervisor.c
index 6c5b14ab1d44,0111ad03a35e..58f47889a2f0
--- a/drivers/xen/sys-hypervisor.c
+++ b/drivers/xen/sys-hypervisor.c
@@@ -437,10 -438,8 +478,9 @@@ static void __exit hyper_sysfs_exit(voi
  	xen_properties_destroy();
  	xen_compilation_destroy();
  	xen_sysfs_uuid_destroy();
 +	xen_sysfs_host_uuid_destroy();
  	xen_sysfs_version_destroy();
  	xen_sysfs_type_destroy();
- 
  }
  module_init(hyper_sysfs_init);
  module_exit(hyper_sysfs_exit);