Commit 65c2ce70 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 84251484 4b660a7f

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 


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

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

Documentation/devicetree/bindings/arm/arch_timer.txt

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ to deliver its interrupts via SPIs. 


- clock-frequency : The frequency of the main counter, in Hz. Optional.



- always-on : a boolean property. If present, the timer is powered through an

  always-on power domain, therefore it never loses context.



Example:



	timer {

Documentation/devicetree/bindings/ata/apm-xgene.txt

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Required properties: 
  * "sata-phy" for the SATA 6.0Gbps PHY



Optional properties:

- dma-coherent		: Present if dma operations are coherent

- status		: Shall be "ok" if enabled or "disabled" if disabled.

			  Default is "ok".
@@ -55,6 +56,7 @@ Example: 
			      <0x0 0x1f22e000 0x0 0x1000>,

			      <0x0 0x1f227000 0x0 0x1000>;

			interrupts = <0x0 0x87 0x4>;

			dma-coherent;

			status = "ok";

			clocks = <&sataclk 0>;

			phys = <&phy2 0>;
@@ -69,6 +71,7 @@ Example: 
			      <0x0 0x1f23e000 0x0 0x1000>,

			      <0x0 0x1f237000 0x0 0x1000>;

			interrupts = <0x0 0x88 0x4>;

			dma-coherent;

			status = "ok";

			clocks = <&sataclk 0>;

			phys = <&phy3 0>;

Documentation/devicetree/bindings/clock/at91-clock.txt

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ Required properties for PMC node: 
- interrupt-controller : tell that the PMC is an interrupt controller.

- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,

	and reflect the bit position in the PMC_ER/DR/SR registers.

	You can use the dt macros defined in dt-bindings/clk/at91.h.

	You can use the dt macros defined in dt-bindings/clock/at91.h.

	0 (AT91_PMC_MOSCS) -> main oscillator ready

	1 (AT91_PMC_LOCKA) -> PLL A ready

	2 (AT91_PMC_LOCKB) -> PLL B ready

Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example 
		clock-output-names =

			"tpu0", "mmcif1", "sdhi3", "sdhi2",

			 "sdhi1", "sdhi0", "mmcif0";

		renesas,clock-indices = <

		clock-indices = <

			R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3

			R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0

			R8A7790_CLK_MMCIF0