Commit beea3f4a authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and... 

Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16/thingm' into for-linus
parents af5666e0 f58b8487 ba391e5a 88f6576f e4aecaf2

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ Sachin P Sant <ssant@in.ibm.com> 
Sam Ravnborg <sam@mars.ravnborg.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Documentation/ABI/testing/sysfs-driver-hid-thingm

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
What:		/sys/class/leds/blink1::<serial>/rgb

Date:		January 2013

Contact:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Description:	The ThingM blink1 is an USB RGB LED. The color notation is

		3-byte hexadecimal. Read this attribute to get the last set

		color. Write the 24-bit hexadecimal color to change the current

		LED color. The default color is full white (0xFFFFFF).

		For instance, set the color to green with: echo 00FF00 > rgb



What:		/sys/class/leds/blink1::<serial>/fade

Date:		January 2013

Contact:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Description:	This attribute allows to set a fade time in milliseconds for

		the next color change. Read the attribute to know the current

		fade time. The default value is set to 0 (no fade time). For

		instance, set a fade time of 2 seconds with: echo 2000 > fade



What:		/sys/class/leds/blink1::<serial>/play

Date:		January 2013

Contact:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>

Description:	This attribute is used to play/pause the light patterns. Write 1

		to start playing, 0 to stop. Reading this attribute returns the

		current playing status.

Documentation/DocBook/drm.tmpl

+5 −0
Original line number Diff line number Diff line
@@ -2285,6 +2285,11 @@ void intel_crt_init(struct drm_device *dev) 
    <sect2>

      <title>Modeset Helper Functions Reference</title>

!Edrivers/gpu/drm/drm_crtc_helper.c

    </sect2>

    <sect2>

      <title>Output Probing Helper Functions Reference</title>

!Pdrivers/gpu/drm/drm_probe_helper.c output probing helper overview

!Edrivers/gpu/drm/drm_probe_helper.c

    </sect2>

    <sect2>

      <title>fbdev Helper Functions Reference</title>

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>;