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

Commit c5e40ee2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 05283187 c5dfd654

.mailmap

+4 −1
Original line number 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>

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 +126,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>

Documentation/ABI/testing/sysfs-bus-iio

+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

Documentation/DocBook/drm.tmpl

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

Documentation/arm/SPEAr/overview.txt

+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

Documentation/device-mapper/cache.txt

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,12 @@ cache metadata mode : ro if read-only, rw if read-write 
	no further I/O will be permitted and the status will just

	contain the string 'Fail'.  The userspace recovery tools

	should then be used.

needs_check		 : 'needs_check' if set, '-' if not set

	A metadata operation has failed, resulting in the needs_check

	flag being set in the metadata's superblock.  The metadata

	device must be deactivated and checked/repaired before the

	cache can be made fully operational again.  '-' indicates

	needs_check is not set.



Messages

--------