Merge 3.19-rc5 into usb-next (0e08365f) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,7 @@ Greg Kroah-Hartman <gregkh@suse.de>
	Greg Kroah-Hartman <greg@kroah.com>		Greg Kroah-Hartman <greg@kroah.com>
	Henk Vergonet <Henk.Vergonet@gmail.com>		Henk Vergonet <Henk.Vergonet@gmail.com>
	Henrik Kretzschmar <henne@nachtwindheim.de>		Henrik Kretzschmar <henne@nachtwindheim.de>
			Henrik Rydberg <rydberg@bitmath.org>
	Herbert Xu <herbert@gondor.apana.org.au>		Herbert Xu <herbert@gondor.apana.org.au>
	Jacob Shin <Jacob.Shin@amd.com>		Jacob Shin <Jacob.Shin@amd.com>
	James Bottomley <jejb@mulgrave.(none)>		James Bottomley <jejb@mulgrave.(none)>

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -14,3 +14,18 @@ Description:
	The /sys/class/mei/meiN directory is created for		The /sys/class/mei/meiN directory is created for
	each probed mei device		each probed mei device

			What: /sys/class/mei/meiN/fw_status
			Date: Nov 2014
			KernelVersion: 3.19
			Contact: Tomas Winkler <tomas.winkler@intel.com>
			Description: Display fw status registers content

			The ME FW writes its status information into fw status
			registers for BIOS and OS to monitor fw health.

			The register contains running state, power management
			state, error codes, and others. The way the registers
			are decoded depends on PCH or SoC generation.
			Also number of registers varies between 1 and 6
			depending on generation.

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -10,12 +10,13 @@ Optional properties:
	Each button (key) is represented as a sub-node of "gpio-keys":		Each button (key) is represented as a sub-node of "gpio-keys":
	Subnode properties:		Subnode properties:

			- gpios: OF device-tree gpio specification.
			- interrupts: the interrupt line for that input.
	- label: Descriptive name of the key.		- label: Descriptive name of the key.
	- linux,code: Keycode to emit.		- linux,code: Keycode to emit.

	Required mutual exclusive subnode-properties:		Note that either "interrupts" or "gpios" properties can be omitted, but not
	- gpios: OF device-tree gpio specification.		both at the same time. Specifying both properties is allowed.
	- interrupts: the interrupt line for that input

	Optional subnode-properties:		Optional subnode-properties:
	- linux,input-type: Specify event type this button/key generates.		- linux,input-type: Specify event type this button/key generates.
	@@ -23,6 +24,9 @@ Optional subnode-properties:
	- debounce-interval: Debouncing interval time in milliseconds.		- debounce-interval: Debouncing interval time in milliseconds.
	If not specified defaults to 5.		If not specified defaults to 5.
	- gpio-key,wakeup: Boolean, button can wake-up the system.		- gpio-key,wakeup: Boolean, button can wake-up the system.
			- linux,can-disable: Boolean, indicates that button is connected
			to dedicated (not shared) interrupt which can be disabled to
			suppress events from the button.

	Example nodes:		Example nodes:

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,8 @@ Optional properties:
	- debounce-interval : Debouncing interval time in milliseconds		- debounce-interval : Debouncing interval time in milliseconds
	- st,scan-count : Scanning cycles elapsed before key data is updated		- st,scan-count : Scanning cycles elapsed before key data is updated
	- st,no-autorepeat : If specified device will not autorepeat		- st,no-autorepeat : If specified device will not autorepeat
			- keypad,num-rows : See ./matrix-keymap.txt
			- keypad,num-columns : See ./matrix-keymap.txt

	Example:		Example:

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,8 @@ fwmark_reflect - BOOLEAN
	route/max_size - INTEGER		route/max_size - INTEGER
	Maximum number of routes allowed in the kernel. Increase		Maximum number of routes allowed in the kernel. Increase
	this when using large numbers of interfaces and/or routes.		this when using large numbers of interfaces and/or routes.
			From linux kernel 3.6 onwards, this is deprecated for ipv4
			as route cache is no longer used.

	neigh/default/gc_thresh1 - INTEGER		neigh/default/gc_thresh1 - INTEGER
	Minimum number of entries to keep. Garbage collector will not		Minimum number of entries to keep. Garbage collector will not