apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge linus into release branch

Browse Source 
Conflicts:

	drivers/acpi/acpi_memhotplug.c
This commit is contained in:
Len Brown
2006-06-29 19:57:46 -04:00
parent 9dce0e950d bf7e851108
commit d120cfb544
1387 changed files with 50185 additions and 18084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/acpi/Kconfig
+1 -1
View File
@@ -335,7 +335,7 @@ config ACPI_CONTAINER
config ACPI_HOTPLUG_MEMORY
tristate "Memory Hotplug"
depends on ACPI
depends on MEMORY_HOTPLUG || X86_64
depends on MEMORY_HOTPLUG
default n
help
This driver adds supports for ACPI Memory Hotplug. This driver