Merge commit 'v3.16' into next (6c8ff877) · Commits · e / devices / android_kernel_samsung_universal8895

.mailmap

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -62,6 +62,11 @@ Jeff Garzik <jgarzik@pretzel.yyz.us>
	Jens Axboe <axboe@suse.de>		Jens Axboe <axboe@suse.de>
	Jens Osterkamp <Jens.Osterkamp@de.ibm.com>		Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
	John Stultz <johnstul@us.ibm.com>		John Stultz <johnstul@us.ibm.com>
			<josh@joshtriplett.org> <josh@freedesktop.org>
			<josh@joshtriplett.org> <josh@kernel.org>
			<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
			<josh@joshtriplett.org> <josht@us.ibm.com>
			<josh@joshtriplett.org> <josht@vnet.ibm.com>
	Juha Yrjola <at solidboot.com>		Juha Yrjola <at solidboot.com>
	Juha Yrjola <juha.yrjola@nokia.com>		Juha Yrjola <juha.yrjola@nokia.com>
	Juha Yrjola <juha.yrjola@solidboot.com>		Juha Yrjola <juha.yrjola@solidboot.com>

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3511,10 +3511,11 @@ S: MacGregor A.C.T 2615
	S: Australia		S: Australia

	N: Josh Triplett		N: Josh Triplett
	E: josh@freedesktop.org		E: josh@joshtriplett.org
	P: 1024D/D0FE7AFB B24A 65C9 1D71 2AC2 DE87 CA26 189B 9946 D0FE 7AFB		P: 4096R/8AFF873D 758E 5042 E397 4BA3 3A9C 1E67 0ED9 A3DF 8AFF 873D
	D: rcutorture maintainer		D: RCU and rcutorture
	D: lock annotations, finding and fixing lock bugs		D: lock annotations, finding and fixing lock bugs
			D: kernel tinification

	N: Winfried Trümper		N: Winfried Trümper
	E: winni@xpilot.org		E: winni@xpilot.org

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -60,12 +60,6 @@ If the driver needs to perform more complex initialization like getting and
	configuring GPIOs it can get its ACPI handle and extract this information		configuring GPIOs it can get its ACPI handle and extract this information
	from ACPI tables.		from ACPI tables.

	Currently the kernel is not able to automatically determine from which ACPI
	device it should make the corresponding platform device so we need to add
	the ACPI device explicitly to acpi_platform_device_ids list defined in
	drivers/acpi/acpi_platform.c. This limitation is only for the platform
	devices, SPI and I2C devices are created automatically as described below.

	DMA support		DMA support
	~~~~~~~~~~~		~~~~~~~~~~~
	DMA controllers enumerated via ACPI should be registered in the system to		DMA controllers enumerated via ACPI should be registered in the system to

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined
	under node /cpus/cpu@0.		under node /cpus/cpu@0.

	Required properties:		Required properties:
	- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt		- None
	for details

	Optional properties:		Optional properties:
			- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for
			details. OPPs must be supplied either via DT, i.e. this property, or
			populated at runtime.
	- clock-latency: Specify the possible maximum transition latency for clock,		- clock-latency: Specify the possible maximum transition latency for clock,
	in unit of nanoseconds.		in unit of nanoseconds.
	- voltage-tolerance: Specify the CPU voltage tolerance in percentage.		- voltage-tolerance: Specify the CPU voltage tolerance in percentage.

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -281,6 +281,19 @@ gestures can normally be extracted from it.
	If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT		If INPUT_PROP_SEMI_MT is not set, the device is assumed to be a true MT
	device.		device.

			INPUT_PROP_TOPBUTTONPAD:
			-----------------------
			Some laptops, most notably the Lenovo *40 series provide a trackstick
			device but do not have physical buttons associated with the trackstick
			device. Instead, the top area of the touchpad is marked to show
			visual/haptic areas for left, middle, right buttons intended to be used
			with the trackstick.

			If INPUT_PROP_TOPBUTTONPAD is set, userspace should emulate buttons
			accordingly. This property does not affect kernel behavior.
			The kernel does not provide button emulation for such devices but treats
			them as any other INPUT_PROP_BUTTONPAD device.

	Guidelines:		Guidelines:
	==========		==========
	The guidelines below ensure proper single-touch and multi-finger functionality.		The guidelines below ensure proper single-touch and multi-finger functionality.