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

Commit 4765096f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/urgent' into sched/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents af0fffd9 f3d133ee

Documentation/device-mapper/writecache.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,8 @@ Constructor parameters: 
   size)

   size)

5. the number of optional parameters (the parameters with an argument

5. the number of optional parameters (the parameters with an argument

   count as two)

   count as two)

	start_sector n		(default: 0)

		offset from the start of cache device in 512-byte sectors

	high_watermark n	(default: 50)

	high_watermark n	(default: 50)

		start writeback when the number of used blocks reach this

		start writeback when the number of used blocks reach this

		watermark

		watermark

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ Required root node properties: 
	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.

	- "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.









Optional nodes:

Optional nodes:

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ Optional nodes: 




 - port/ports: to describe a connection to an external encoder. The

 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.

   supports a single port with a single endpoint.





 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt

+1 −1
Original line number Original line Diff line number Diff line 
Nintendo Wii (Hollywood) GPIO controller

Nintendo Wii (Hollywood) GPIO controller





Required properties:

Required properties:

- compatible: "nintendo,hollywood-gpio

- compatible: "nintendo,hollywood-gpio"

- reg: Physical base address and length of the controller's registers.

- reg: Physical base address and length of the controller's registers.

- gpio-controller: Marks the device node as a GPIO controller.

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be <2>. The first cell is the pin number and the

- #gpio-cells: Should be <2>. The first cell is the pin number and the

Documentation/devicetree/bindings/input/touchscreen/hideep.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ i2c@00000000 { 
		reg = <0x6c>;

		reg = <0x6c>;

		interrupt-parent = <&gpx1>;

		interrupt-parent = <&gpx1>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		vdd-supply = <&ldo15_reg>";

		vdd-supply = <&ldo15_reg>;

		vid-supply = <&ldo18_reg>;

		vid-supply = <&ldo18_reg>;

		reset-gpios = <&gpx1 5 0>;

		reset-gpios = <&gpx1 5 0>;

		touchscreen-size-x = <1080>;

		touchscreen-size-x = <1080>;