Commit 650c9197 authored by Chris Zankel's avatar Chris Zankel
Browse files

Merge tag 'v4.2' into for_next

Linux 4.2
parents 895fb315 64291f7d
Loading
Loading
Loading
Loading

.get_maintainer.ignore

0 → 100644
+1 −0
Original line number Diff line number Diff line
Christoph Hellwig <hch@lst.de>
+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Aleksey Gorelov <aleksey_gorelov@phoenix.com>
Al Viro <viro@ftp.linux.org.uk>
Al Viro <viro@zenIV.linux.org.uk>
Andreas Herrmann <aherrman@de.ibm.com>
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
Andrew Morton <akpm@linux-foundation.org>
Andrew Vasquez <andrew.vasquez@qlogic.com>
Andy Adamson <andros@citi.umich.edu>
@@ -116,6 +117,7 @@ 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>
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
Sumit Semwal <sumit.semwal@ti.com>
Tejun Heo <htejun@gmail.com>
Thomas Graf <tgraf@suug.ch>
@@ -125,7 +127,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Uwe Kleine-König <ukl@pengutronix.de>
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
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>
Yusuke Goda <goda.yusuke@renesas.com>
Gustavo Padovan <gustavo@las.ic.unicamp.br>
+2 −4
Original line number Diff line number Diff line
@@ -1234,10 +1234,8 @@ Description:
		object is near the sensor, usually be observing
		reflectivity of infrared or ultrasound emitted.
		Often these sensors are unit less and as such conversion
		to SI units is not possible.  Where it is, the units should
		be meters.  If such a conversion is not possible, the reported
		values should behave in the same way as a distance, i.e. lower
		values indicate something is closer to the sensor.
		to SI units is not possible. Higher proximity measurements
		indicate closer objects, and vice versa.

What:		/sys/.../iio:deviceX/in_illuminance_input
What:		/sys/.../iio:deviceX/in_illuminance_raw
+1 −1
Original line number Diff line number Diff line
@@ -3383,7 +3383,7 @@ void intel_crt_init(struct drm_device *dev)
	<td valign="top" >TBD</td>
	</tr>
	<tr>
	<td rowspan="2" valign="top" >omap</td>
	<td valign="top" >omap</td>
	<td valign="top" >Generic</td>
	<td valign="top" >“zorder”</td>
	<td valign="top" >RANGE</td>
+1 −1
Original line number Diff line number Diff line
@@ -60,4 +60,4 @@ Introduction
  Document Author
  ---------------

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