Merge branches 'release' and 'doc' into release (29ea5171) · Commits · e / devices / android_kernel_xiaomi_markw

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/

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

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

+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

+0 −0

File moved.