You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Len Brown 057316cc6a Merge branch 'linus' into test ... Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c arch/x86/kernel/acpi/sleep.c drivers/acpi/Kconfig drivers/pnp/Makefile drivers/pnp/quirks.c Signed-off-by: Len Brown <len.brown@intel.com>		17 years ago
..
00-INDEX	laptops: move laptop-mode.txt to Documentation/laptops/	17 years ago
acer-wmi.txt	acer-wmi: Remove wireless and bluetooth sysfs entries	17 years ago
disk-shock-protection.txt	ata: Add documentation for hard disk shock protection interface (v3)	17 years ago
laptop-mode.txt	laptops: move laptop-mode.txt to Documentation/laptops/	17 years ago
sony-laptop.txt	sony-laptop - Move sony-laptop.txt to Documentation/laptops	17 years ago
sonypi.txt	sonypi - Move sonypi.txt to Documentation/laptops	17 years ago
thinkpad-acpi.txt	ACPI: thinkpad-acpi: wan radio control is not experimental	17 years ago