Merge branch 'linus' into release

Conflicts:
	arch/x86/kernel/cpu/cpufreq/longhaul.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 0 insertions, 2 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index ae41cf3cf4e..53698ea0837 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -197,7 +197,6 @@ static int acpi_fan_add_fs(struct acpi_device *device)
                                                      acpi_fan_dir);
                 if (!acpi_device_dir(device))
                         return -ENODEV;
-                acpi_device_dir(device)->owner = THIS_MODULE;
         }
 
         /* 'status' [R/W] */
@@ -351,7 +350,6 @@ static int __init acpi_fan_init(void)
         acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);
         if (!acpi_fan_dir)
                 return -ENODEV;
-        acpi_fan_dir->owner = THIS_MODULE;
 #endif
 
         result = acpi_bus_register_driver(&acpi_fan_driver);