Commit 96e31022 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (32 commits)
  ACPI: thermal: show temperature in millidegree Celsius
  thermal: fix generic thermal I/F for hwmon
  acer-wmi: build depends on i8042
  documentation:  Move power-related files to Documentation/power/
  ACPI: buffer array too short in drivers/acpi/system.c
  acer-wmi: Add DMI quirk for mail LED support on Acer Aspire 3610/ 5610
  acer-wmi: Fix DSDT path in documentation
  acer-wmi: Make device detection error messages more descriptive
  laptops: move laptop-mode.txt to Documentation/laptops/
  ACPICA: Warn if packages with invalid references are evaluated
  ACPI: add _PRT quirks to work around broken firmware
  Hibernation: Fix mark_nosave_pages()
  ACPI: Ignore _BQC object when registering backlight device
  ACPI: WMI: Clean up handling of spec violating data blocks
  acer-wmi: Don't warn if mail LED cannot be detected
  acer-wmi: Rename mail LED correctly & remove hardcoded colour
  ACPI: use ACPI_DEBUG_PRINT instead of printk in acpi_processor_hotplug_notify()
  ACPI: button: make real parent for input devices in device tree
  toshiba_acpi: Enable autoloading
  ACPI: EC: Handle IRQ storm on Acer laptops
  ...
parents f2005e17 29ea5171

Documentation/00-INDEX

+0 −6
Original line number Original line Diff line number Diff line
@@ -225,8 +225,6 @@ kprobes.txt 
	- documents the kernel probes debugging feature.

	- documents the kernel probes debugging feature.

kref.txt

kref.txt

	- docs on adding reference counters (krefs) to kernel objects.

	- docs on adding reference counters (krefs) to kernel objects.

laptop-mode.txt

	- how to conserve battery power using laptop-mode.

laptops/

laptops/

	- directory with laptop related info and laptop driver documentation.

	- directory with laptop related info and laptop driver documentation.

ldm.txt

ldm.txt
@@ -301,12 +299,8 @@ pcmcia/ 
	- info on the Linux PCMCIA driver.

	- info on the Linux PCMCIA driver.

pi-futex.txt

pi-futex.txt

	- documentation on lightweight PI-futexes.

	- documentation on lightweight PI-futexes.

pm.txt

	- info on Linux power management support.

pnp.txt

pnp.txt

	- Linux Plug and Play documentation.

	- Linux Plug and Play documentation.

power_supply_class.txt

	- Tells userspace about battery, UPS, AC or DC power supply properties

power/

power/

	- directory with info on Linux PCI power management.

	- directory with info on Linux PCI power management.

powerpc/

powerpc/

Documentation/filesystems/proc.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -1506,13 +1506,13 @@ laptop_mode 
-----------

-----------





laptop_mode is a knob that controls "laptop mode". All the things that are

laptop_mode is a knob that controls "laptop mode". All the things that are

controlled by this knob are discussed in Documentation/laptop-mode.txt.

controlled by this knob are discussed in Documentation/laptops/laptop-mode.txt.





block_dump

block_dump

----------

----------





block_dump enables block I/O debugging when set to a nonzero value. More

block_dump enables block I/O debugging when set to a nonzero value. More

information on block I/O debugging is in Documentation/laptop-mode.txt.

information on block I/O debugging is in Documentation/laptops/laptop-mode.txt.





swap_token_timeout

swap_token_timeout

------------------

------------------

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file 
			strict -- Be less tolerant of platforms that are not

			strict -- Be less tolerant of platforms that are not

				strictly ACPI specification compliant.

				strictly ACPI specification compliant.





			See also Documentation/pm.txt, pci=noacpi

			See also Documentation/power/pm.txt, pci=noacpi





	acpi_apic_instance=	[ACPI, IOAPIC]

	acpi_apic_instance=	[ACPI, IOAPIC]

			Format: <int>

			Format: <int>

Documentation/laptops/00-INDEX

+2 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,8 @@ 
	- This file

	- This file

acer-wmi.txt

acer-wmi.txt

	- information on the Acer Laptop WMI Extras driver.

	- information on the Acer Laptop WMI Extras driver.

laptop-mode.txt

	- how to conserve battery power using laptop-mode.

sony-laptop.txt

sony-laptop.txt

	- Sony Notebook Control Driver (SNC) Readme.

	- Sony Notebook Control Driver (SNC) Readme.

sonypi.txt

sonypi.txt

Documentation/laptops/acer-wmi.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ DSDT. 




To send me the DSDT, as root/sudo:

To send me the DSDT, as root/sudo:





cat /sys/firmware/acpi/DSDT > dsdt

cat /sys/firmware/acpi/tables/DSDT > dsdt





And send me the resulting 'dsdt' file.

And send me the resulting 'dsdt' file.
@@ -169,7 +169,7 @@ can be added to acer-wmi. 




The LED is exposed through the LED subsystem, and can be found in:

The LED is exposed through the LED subsystem, and can be found in:





/sys/devices/platform/acer-wmi/leds/acer-mail:green/

/sys/devices/platform/acer-wmi/leds/acer-wmi::mail/





The mail LED is autodetected, so if you don't have one, the LED device won't

The mail LED is autodetected, so if you don't have one, the LED device won't

be registered.

be registered.