Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (41 commits) ACPICA: hw: Don't carry spinlock over suspend ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write} ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle ACPI: clean up acpi_enter_sleep_state_prep Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish ACPI: suppress uninitialized var warning cpuidle: consolidate 2.6.22 cpuidle branch into one patch ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs ACPI: AC: Add sysfs interface ACPI: SBS: Add sysfs alarm ACPI: SBS: Add ACPI_PROCFS around procfs handling code. ACPI: SBS: Add support for power_supply class (and sysfs) ACPI: SBS: Make SBS reads table-driven. ACPI: SBS: Simplify data structures in SBS ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002) ACPI: EC: Add new query handler to list head. ACPI: Add acpi_bus_generate_event4() function ACPI: Battery: add sysfs alarm ACPI: Battery: Add sysfs support ACPI: Battery: Misc clean-ups, no functional changes ... Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually
Showing
此差异已折叠。
drivers/acpi/sbshc.c
0 → 100644
drivers/acpi/sbshc.h
0 → 100644
drivers/cpuidle/Kconfig
0 → 100644
drivers/cpuidle/Makefile
0 → 100644
drivers/cpuidle/cpuidle.c
0 → 100644
drivers/cpuidle/cpuidle.h
0 → 100644
drivers/cpuidle/driver.c
0 → 100644
drivers/cpuidle/governor.c
0 → 100644
drivers/cpuidle/governors/menu.c
0 → 100644
drivers/cpuidle/sysfs.c
0 → 100644
drivers/misc/fujitsu-laptop.c
0 → 100644
此差异已折叠。
include/linux/cpuidle.h
0 → 100644
此差异已折叠。
此差异已折叠。
想要评论请 注册 或 登录