Merge tag 'v4.2-rc6' into asoc-topology (d033de5c) · Commits · 戴 / test

.mailmap

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	Stephen Hemminger <shemminger@osdl.org>		Stephen Hemminger <shemminger@osdl.org>
			Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
	Sumit Semwal <sumit.semwal@ti.com>		Sumit Semwal <sumit.semwal@ti.com>
	Tejun Heo <htejun@gmail.com>		Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	@@ -125,7 +126,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
			Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
			Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>

Documentation/ABI/testing/sysfs-bus-iio

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1234,10 +1234,8 @@ Description:
	object is near the sensor, usually be observing		object is near the sensor, usually be observing
	reflectivity of infrared or ultrasound emitted.		reflectivity of infrared or ultrasound emitted.
	Often these sensors are unit less and as such conversion		Often these sensors are unit less and as such conversion
	to SI units is not possible. Where it is, the units should		to SI units is not possible. Higher proximity measurements
	be meters. If such a conversion is not possible, the reported		indicate closer objects, and vice versa.
	values should behave in the same way as a distance, i.e. lower
	values indicate something is closer to the sensor.

	What: /sys/.../iio:deviceX/in_illuminance_input		What: /sys/.../iio:deviceX/in_illuminance_input
	What: /sys/.../iio:deviceX/in_illuminance_raw		What: /sys/.../iio:deviceX/in_illuminance_raw

Documentation/DocBook/drm.tmpl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
	<td valign="top" >TBD</td>		<td valign="top" >TBD</td>
	</tr>		</tr>
	<tr>		<tr>
	<td rowspan="2" valign="top" >omap</td>		<td valign="top" >omap</td>
	<td valign="top" >Generic</td>		<td valign="top" >Generic</td>
	<td valign="top" >“zorder”</td>		<td valign="top" >“zorder”</td>
	<td valign="top" >RANGE</td>		<td valign="top" >RANGE</td>

Documentation/arm/SPEAr/overview.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,4 +60,4 @@ Introduction
	Document Author		Document Author
	---------------		---------------

	Viresh Kumar <viresh.linux@gmail.com>, (c) 2010-2012 ST Microelectronics		Viresh Kumar <vireshk@kernel.org>, (c) 2010-2012 ST Microelectronics

Documentation/arm/sunxi/README

+17 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ SunXi family
	+ User Manual		+ User Manual
	http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf		http://dl.linux-sunxi.org/A20/A20%20User%20Manual%202013-03-22.pdf

	- Allwinner A23		- Allwinner A23 (sun8i)
	+ Datasheet		+ Datasheet
	http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf		http://dl.linux-sunxi.org/A23/A23%20Datasheet%20V1.0%2020130830.pdf
	+ User Manual		+ User Manual
	@@ -55,7 +55,23 @@ SunXi family
	+ User Manual		+ User Manual
	http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf		http://dl.linux-sunxi.org/A31/A3x_release_document/A31s/IC/A31s%20User%20Manual%20%20V1.0%2020130322.pdf

			- Allwinner A33 (sun8i)
			+ Datasheet
			http://dl.linux-sunxi.org/A33/A33%20Datasheet%20release%201.1.pdf
			+ User Manual
			http://dl.linux-sunxi.org/A33/A33%20user%20manual%20release%201.1.pdf

			- Allwinner H3 (sun8i)
			+ Datasheet
			http://dl.linux-sunxi.org/H3/Allwinner_H3_Datasheet_V1.0.pdf

	* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs		* Quad ARM Cortex-A15, Quad ARM Cortex-A7 based SoCs
	- Allwinner A80		- Allwinner A80
	+ Datasheet		+ Datasheet
	http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf		http://dl.linux-sunxi.org/A80/A80_Datasheet_Revision_1.0_0404.pdf

			* Octa ARM Cortex-A7 based SoCs
			- Allwinner A83T
			+ Not Supported
			+ Datasheet
			http://dl.linux-sunxi.org/A83T/A83T_datasheet_Revision_1.1.pdf

Admin message