Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe8912b authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 50531444 dba92d3b

Documentation/00-INDEX

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

kref.txt

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

laptop-mode.txt

	- how to conserve battery power using laptop-mode.

laptops/

	- directory with laptop related info and laptop driver documentation.

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

pi-futex.txt

	- documentation on lightweight PI-futexes.

pm.txt

	- info on Linux power management support.

pnp.txt

	- Linux Plug and Play documentation.

power_supply_class.txt

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

power/

	- directory with info on Linux PCI power management.

powerpc/

Documentation/filesystems/proc.txt

+2 −2
Original line number 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

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 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

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

Documentation/kernel-parameters.txt

+1 −1
Original line number 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

				strictly ACPI specification compliant.



			See also Documentation/pm.txt, pci=noacpi

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



	acpi_apic_instance=	[ACPI, IOAPIC]

			Format: <int>

Documentation/laptops/00-INDEX

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

acer-wmi.txt

	- information on the Acer Laptop WMI Extras driver.

laptop-mode.txt

	- how to conserve battery power using laptop-mode.

sony-laptop.txt

	- Sony Notebook Control Driver (SNC) Readme.

sonypi.txt

Documentation/laptops/acer-wmi.txt

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


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.
@@ -169,7 +169,7 @@ can be added to acer-wmi. 


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

be registered.