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

Commit ba4a63f8 authored by Russell King's avatar Russell King
Browse files

Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc',... 

Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc', 'opcodes' and 'syscall' into for-linus
parents 43a60c17 9d4876f0 7253b85c 73efd530 a3d7193e 508514ed ebb5e15c

Documentation/ABI/testing/sysfs-bus-pci

+12 −0
Original line number Diff line number Diff line
@@ -210,3 +210,15 @@ Users: 
		firmware assigned instance number of the PCI

		device that can help in understanding the firmware

		intended order of the PCI device.



What:		/sys/bus/pci/devices/.../d3cold_allowed

Date:		July 2012

Contact:	Huang Ying <ying.huang@intel.com>

Description:

		d3cold_allowed is bit to control whether the corresponding PCI

		device can be put into D3Cold state.  If it is cleared, the

		device will never be put into D3Cold state.  If it is set, the

		device may be put into D3Cold state if other requirements are

		satisfied too.  Reading this attribute will show the current

		value of d3cold_allowed bit.  Writing this attribute will set

		the value of d3cold_allowed bit.

Documentation/ABI/testing/sysfs-platform-ideapad-laptop

+11 −0
Original line number Diff line number Diff line
@@ -5,4 +5,15 @@ Contact: "Ike Panhc <ike.pan@canonical.com>" 
Description:

		Control the power of camera module. 1 means on, 0 means off.



What:		/sys/devices/platform/ideapad/fan_mode

Date:		June 2012

KernelVersion:	3.6

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Change fan mode

		There are four available modes:

			* 0 -> Super Silent Mode

			* 1 -> Standard Mode

			* 2 -> Dust Cleaning

			* 4 -> Efficient Thermal Dissipation Mode

Documentation/DocBook/filesystems.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ all your transactions. 
</para>



<para>

Then at umount time , in your put_super() (2.4) or write_super() (2.5)

you can then call journal_destroy() to clean up your in-core journal object.

Then at umount time , in your put_super() you can then call journal_destroy()

to clean up your in-core journal object.

</para>



<para>

Documentation/DocBook/media/v4l/vidioc-g-tuner.xml

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ the structure refers to a radio tuner the 
<constant>V4L2_TUNER_CAP_NORM</constant> flags can't be used.</para>

<para>If multiple frequency bands are supported, then

<structfield>capability</structfield> is the union of all

<structfield>capability></structfield> fields of each &v4l2-frequency-band;.

<structfield>capability</structfield> fields of each &v4l2-frequency-band;.

</para></entry>

	  </row>

	  <row>

Documentation/block/00-INDEX

+8 −2
Original line number Diff line number Diff line
@@ -3,15 +3,21 @@ 
biodoc.txt

	- Notes on the Generic Block Layer Rewrite in Linux 2.5

capability.txt

	- Generic Block Device Capability (/sys/block/<disk>/capability)

	- Generic Block Device Capability (/sys/block/<device>/capability)

cfq-iosched.txt

	- CFQ IO scheduler tunables

data-integrity.txt

	- Block data integrity

deadline-iosched.txt

	- Deadline IO scheduler tunables

ioprio.txt

	- Block io priorities (in CFQ scheduler)

queue-sysfs.txt

	- Queue's sysfs entries

request.txt

	- The members of struct request (in include/linux/blkdev.h)

stat.txt

	- Block layer statistics in /sys/block/<dev>/stat

	- Block layer statistics in /sys/block/<device>/stat

switching-sched.txt

	- Switching I/O schedulers at runtime

writeback_cache_control.txt