lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into release

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

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2009-04-05 02:14:15 -04:00
parent 8a3f257c70 6bb597507f
commit 478c6a43fc
6737 changed files with 522868 additions and 237884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/fan.c
View File

@@ -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);