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

Commit 1304a734 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 1d76efe1 23dcfa61

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/devicetree/bindings/arm/mrvl/intc.txt

+20 −0
Original line number Diff line number Diff line
@@ -38,3 +38,23 @@ Example: 
		reg-names = "mux status", "mux mask";

		mrvl,intc-nr-irqs = <2>;

	};



* Marvell Orion Interrupt controller



Required properties

- compatible :  Should be "marvell,orion-intc".

- #interrupt-cells: Specifies the number of cells needed to encode an

  interrupt source. Supported value is <1>.

- interrupt-controller : Declare this node to be an interrupt controller.

- reg : Interrupt mask address. A list of 4 byte ranges, one per controller.

        One entry in the list represents 32 interrupts.



Example:



	intc: interrupt-controller {

        	compatible = "marvell,orion-intc", "marvell,intc";

		interrupt-controller;

		#interrupt-cells = <1>;

                reg = <0xfed20204 0x04>,

		      <0xfed20214 0x04>;

        };

Documentation/devicetree/bindings/ata/marvell.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* Marvell Orion SATA



Required Properties:

- compatibility : "marvell,orion-sata"

- reg           : Address range of controller

- interrupts    : Interrupt controller is using

- nr-ports      : Number of SATA ports in use.



Example:



	sata@80000 {

		compatible = "marvell,orion-sata";

		reg = <0x80000 0x5000>;

		interrupts = <21>;

		nr-ports = <2>;

	}