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

Commit fe36d891 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into irq/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 16a8083c e2857b8f

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Original line Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

	    <entry>Camera video sensor entity.</entry>

Documentation/cgroup-v2.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ This is the authoritative documentation on the design, interface and 
conventions of cgroup v2.  It describes all userland-visible aspects

conventions of cgroup v2.  It describes all userland-visible aspects

of cgroup including core and specific controller behaviors.  All

of cgroup including core and specific controller behaviors.  All

future changes must be reflected in this document.  Documentation for

future changes must be reflected in this document.  Documentation for

v1 is available under Documentation/cgroup-legacy/.

v1 is available under Documentation/cgroup-v1/.





CONTENTS

CONTENTS

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ that they are defined using standard clock bindings with following 
clock-output-names:

clock-output-names:

 - "xin24m" - crystal input - required,

 - "xin24m" - crystal input - required,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_i2s" - external I2S clock - optional,

 - "ext_gmac" - external GMAC clock - optional

 - "rmii_clkin" - external EMAC clock - optional





Example: Clock controller node:

Example: Clock controller node:

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

+2 −3
Original line number Original line Diff line number Diff line
@@ -24,9 +24,8 @@ Main node required properties: 
		1 = edge triggered

		1 = edge triggered

		4 = level triggered

		4 = level triggered





  Cells 4 and beyond are reserved for future use. When the 1st cell

  Cells 4 and beyond are reserved for future use and must have a value

  has a value of 0 or 1, cells 4 and beyond act as padding, and may be

  of 0 if present.

  ignored. It is recommended that padding cells have a value of 0.





- reg : Specifies base physical address(s) and size of the GIC

- reg : Specifies base physical address(s) and size of the GIC

  registers, in the following order:

  registers, in the following order:

Documentation/devicetree/bindings/net/renesas,ravb.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -82,8 +82,8 @@ Example: 
				  "ch16", "ch17", "ch18", "ch19",

				  "ch16", "ch17", "ch18", "ch19",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch20", "ch21", "ch22", "ch23",

				  "ch24";

				  "ch24";

		clocks = <&mstp8_clks R8A7795_CLK_ETHERAVB>;

		clocks = <&cpg CPG_MOD 812>;

		power-domains = <&cpg_clocks>;

		power-domains = <&cpg>;

		phy-mode = "rgmii-id";

		phy-mode = "rgmii-id";

		phy-handle = <&phy0>;

		phy-handle = <&phy0>;