| commit | c80dc60b03d633047c7f96be87fd59cdcdbb929f | |
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Mon, 10 Jul 2006 22:14:38 +0000 (10 15:14 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Mon, 10 Jul 2006 22:14:38 +0000 (10 15:14 -0700) | ||
| tree | 1ef931c2287e376f8fef37cea89f7a951d9d3b00 | treesnapshot (tar.gz zip) |
| parent | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab | commitdiff |
| parent | 0466684907ea1695eeef98cb28ca3399882ecc0a | commitdiff |
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: ACPI_DOCK: Initialize the atomic notifier list
ACPI: acpi_os_allocate() fixes
ACPI: SBS: fix initialization, sem2mutex
ACPI: add 'const' to several ACPI file_operations
ACPI: delete some defaults from ACPI Kconfig
ACPI: "Device `[%s]' is not power manageable" make message debug only
ACPI: ACPI_DOCK Kconfig
Revert "Revert "ACPI: dock driver""
ACPI: acpi_os_get_thread_id() returns current
ACPI: ACPICA 20060707
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: ACPI_DOCK: Initialize the atomic notifier list
ACPI: acpi_os_allocate() fixes
ACPI: SBS: fix initialization, sem2mutex
ACPI: add 'const' to several ACPI file_operations
ACPI: delete some defaults from ACPI Kconfig
ACPI: "Device `[%s]' is not power manageable" make message debug only
ACPI: ACPI_DOCK Kconfig
Revert "Revert "ACPI: dock driver""
ACPI: acpi_os_get_thread_id() returns current
ACPI: ACPICA 20060707
| drivers/acpi/thermal.c | diff1 | diff2 | blobhistory |
| drivers/pci/hotplug/Kconfig | diff1 | diff2 | blobhistory |