Merge tag 'v3.5-rc7' into next/boards (608f593b) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/ABI/testing/sysfs-class-mtd

+9 −8

Documentation/DocBook/media/v4l/controls.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3988,7 +3988,7 @@ interface and may change in the future.</para>
	from RGB to Y'CbCr color space.		from RGB to Y'CbCr color space.
	</entry>		</entry>
	</row>		</row>
	<row id = "v4l2-jpeg-chroma-subsampling">		<row>
	<entrytbl spanname="descr" cols="2">		<entrytbl spanname="descr" cols="2">
	<tbody valign="top">		<tbody valign="top">
	<row>		<row>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -284,13 +284,6 @@ These controls are described in <xref
	processing controls. These controls are described in <xref		processing controls. These controls are described in <xref
	linkend="image-process-controls" />.</entry>		linkend="image-process-controls" />.</entry>
	</row>		</row>
	<row>
	<entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
	<entry>0x9d0000</entry>
	<entry>The class containing JPEG compression controls.
	These controls are described in <xref
	linkend="jpeg-controls" />.</entry>
	</row>
	</tbody>		</tbody>
	</tgroup>		</tgroup>
	</table>		</table>

MAINTAINERS

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4857,6 +4857,7 @@ M: Kevin Hilman <khilman@ti.com>
	L: linux-omap@vger.kernel.org		L: linux-omap@vger.kernel.org
	S: Maintained		S: Maintained
	F: arch/arm/omap/pm		F: arch/arm/omap/pm
			F: drivers/cpufreq/omap-cpufreq.c

	OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT		OMAP POWERDOMAIN/CLOCKDOMAIN SOC ADAPTATION LAYER SUPPORT
	M: Rajendra Nayak <rnayak@ti.com>		M: Rajendra Nayak <rnayak@ti.com>
	@@ -5909,7 +5910,7 @@ M: Ingo Molnar <mingo@redhat.com>
	M: Peter Zijlstra <peterz@infradead.org>		M: Peter Zijlstra <peterz@infradead.org>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
	S: Maintained		S: Maintained
	F: kernel/sched*		F: kernel/sched/
	F: include/linux/sched.h		F: include/linux/sched.h

	SCORE ARCHITECTURE		SCORE ARCHITECTURE

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 3		VERSION = 3
	PATCHLEVEL = 5		PATCHLEVEL = 5
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc7
	NAME = Saber-toothed Squirrel		NAME = Saber-toothed Squirrel

	# DOCUMENTATION		# DOCUMENTATION

Original line number	Original line	Diff line number	Diff line
	@@ -142,13 +142,14 @@ KernelVersion: 3.4
	Contact: linux-mtd@lists.infradead.org		Contact: linux-mtd@lists.infradead.org
	Description:		Description:
	This allows the user to examine and adjust the criteria by which		This allows the user to examine and adjust the criteria by which
	mtd returns -EUCLEAN from mtd_read(). If the maximum number of		mtd returns -EUCLEAN from mtd_read() and mtd_read_oob(). If the
	bit errors that were corrected on any single region comprising		maximum number of bit errors that were corrected on any single
	an ecc step (as reported by the driver) equals or exceeds this		region comprising an ecc step (as reported by the driver) equals
	value, -EUCLEAN is returned. Otherwise, absent an error, 0 is		or exceeds this value, -EUCLEAN is returned. Otherwise, absent
	returned. Higher layers (e.g., UBI) use this return code as an		an error, 0 is returned. Higher layers (e.g., UBI) use this
	indication that an erase block may be degrading and should be		return code as an indication that an erase block may be
	scrutinized as a candidate for being marked as bad.		degrading and should be scrutinized as a candidate for being
			marked as bad.

	The initial value may be specified by the flash device driver.		The initial value may be specified by the flash device driver.
	If not, then the default value is ecc_strength.		If not, then the default value is ecc_strength.
	@@ -167,7 +168,7 @@ Description:
	block degradation, but high enough to avoid the consequences of		block degradation, but high enough to avoid the consequences of
	a persistent return value of -EUCLEAN on devices where sticky		a persistent return value of -EUCLEAN on devices where sticky
	bitflips occur. Note that if bitflip_threshold exceeds		bitflips occur. Note that if bitflip_threshold exceeds
	ecc_strength, -EUCLEAN is never returned by mtd_read().		ecc_strength, -EUCLEAN is never returned by the read operations.
	Conversely, if bitflip_threshold is zero, -EUCLEAN is always		Conversely, if bitflip_threshold is zero, -EUCLEAN is always
	returned, absent a hard error.		returned, absent a hard error.