Merge branch 'master' into for-next (9938b044) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
	Andrew Morton <akpm@linux-foundation.org>		Andrew Morton <akpm@linux-foundation.org>
	Andrew Vasquez <andrew.vasquez@qlogic.com>		Andrew Vasquez <andrew.vasquez@qlogic.com>
	Andy Adamson <andros@citi.umich.edu>		Andy Adamson <andros@citi.umich.edu>
			Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
	Archit Taneja <archit@ti.com>		Archit Taneja <archit@ti.com>
	Arnaud Patard <arnaud.patard@rtp-net.org>		Arnaud Patard <arnaud.patard@rtp-net.org>
	Arnd Bergmann <arnd@arndb.de>		Arnd Bergmann <arnd@arndb.de>
	@@ -32,6 +33,7 @@ Björn Steinbrink <B.Steinbrink@gmx.de>
	Brian Avery <b.avery@hp.com>		Brian Avery <b.avery@hp.com>
	Brian King <brking@us.ibm.com>		Brian King <brking@us.ibm.com>
	Christoph Hellwig <hch@lst.de>		Christoph Hellwig <hch@lst.de>
			Christophe Ricard <christophe.ricard@gmail.com>
	Corey Minyard <minyard@acm.org>		Corey Minyard <minyard@acm.org>
	Damian Hobson-Garcia <dhobsong@igel.co.jp>		Damian Hobson-Garcia <dhobsong@igel.co.jp>
	David Brownell <david-b@pacbell.net>		David Brownell <david-b@pacbell.net>

CREDITS

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -534,6 +534,7 @@ N: NeilBrown
	E: neil@brown.name		E: neil@brown.name
	P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9		P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F 497A 39EC 9EDD 5662 81B9
	D: NFSD Maintainer 2000-2007		D: NFSD Maintainer 2000-2007
			D: MD Maintainer 2001-2016

	N: Zach Brown		N: Zach Brown
	E: zab@zabbo.net		E: zab@zabbo.net
	@@ -1507,6 +1508,14 @@ S: 312/107 Canberra Avenue
	S: Griffith, ACT 2603		S: Griffith, ACT 2603
	S: Australia		S: Australia

			N: Andreas Herrmann
			E: herrmann.der.user@gmail.com
			E: herrmann.der.user@googlemail.com
			D: Key developer of x86/AMD64
			D: Author of AMD family 15h processor power monitoring driver
			D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
			S: Germany

	N: Sebastian Hetze		N: Sebastian Hetze
	E: she@lunetix.de		E: she@lunetix.de
	D: German Linux Documentation,		D: German Linux Documentation,
	@@ -1847,6 +1856,16 @@ S: Korte Heul 95
	S: 1403 ND BUSSUM		S: 1403 ND BUSSUM
	S: The Netherlands		S: The Netherlands

			N: Martin Kepplinger
			E: martink@posteo.de
			E: martin.kepplinger@theobroma-systems.com
			W: http://www.martinkepplinger.com
			D: mma8452 accelerators iio driver
			D: Kernel cleanups
			S: Garnisonstraße 26
			S: 4020 Linz
			S: Austria

	N: Karl Keyte		N: Karl Keyte
	E: karl@koft.com		E: karl@koft.com
	D: Disk usage statistics and modifications to line printer driver		D: Disk usage statistics and modifications to line printer driver
	@@ -3035,6 +3054,7 @@ D: PLX USB338x driver
	D: PCA9634 driver		D: PCA9634 driver
	D: Option GTM671WFS		D: Option GTM671WFS
	D: Fintek F81216A		D: Fintek F81216A
			D: AD5761 iio driver
	D: Various kernel hacks		D: Various kernel hacks
	S: Qtechnology A/S		S: Qtechnology A/S
	S: Valby Langgade 142		S: Valby Langgade 142

Documentation/ABI/obsolete/sysfs-class-rfkill

deleted100644 → 0

+0 −29

Original line number	Original line	Diff line number	Diff line
	rfkill - radio frequency (RF) connector kill switch support

	For details to this subsystem look at Documentation/rfkill.txt.

	What: /sys/class/rfkill/rfkill[0-9]+/state
	Date: 09-Jul-2007
	KernelVersion v2.6.22
	Contact: linux-wireless@vger.kernel.org
	Description: Current state of the transmitter.
	This file is deprecated and scheduled to be removed in 2014,
	because its not possible to express the 'soft and hard block'
	state of the rfkill driver.
	Values: A numeric value.
	0: RFKILL_STATE_SOFT_BLOCKED
	transmitter is turned off by software
	1: RFKILL_STATE_UNBLOCKED
	transmitter is (potentially) active
	2: RFKILL_STATE_HARD_BLOCKED
	transmitter is forced off by something outside of
	the driver's control.

	What: /sys/class/rfkill/rfkill[0-9]+/claim
	Date: 09-Jul-2007
	KernelVersion v2.6.22
	Contact: linux-wireless@vger.kernel.org
	Description: This file is deprecated because there no longer is a way to
	claim just control over a single rfkill instance.
	This file is scheduled to be removed in 2012.
	Values: 0: Kernel handles events

Documentation/ABI/testing/sysfs-gpio→Documentation/ABI/obsolete/sysfs-gpio

+3 −1

Original line number	Original line	Diff line number	Diff line
	What: /sys/class/gpio/		What: /sys/class/gpio/
	Date: July 2008		Date: July 2008
	KernelVersion: 2.6.27		KernelVersion: 2.6.27
	Contact: David Brownell <dbrownell@users.sourceforge.net>		Contact: Linus Walleij <linusw@kernel.org>
	Description:		Description:

	As a Kconfig option, individual GPIO signals may be accessed from		As a Kconfig option, individual GPIO signals may be accessed from
	@@ -26,3 +26,5 @@ Description:
	/label ... (r/o) descriptive, not necessarily unique		/label ... (r/o) descriptive, not necessarily unique
	/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)		/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)

			This ABI is deprecated and will be removed after 2020. It is
			replaced with the GPIO character device.

Documentation/ABI/removed/sysfs-class-rfkill

0 → 100644

+13 −0

Original line number	Original line	Diff line number	Diff line
			rfkill - radio frequency (RF) connector kill switch support

			For details to this subsystem look at Documentation/rfkill.txt.

			What: /sys/class/rfkill/rfkill[0-9]+/claim
			Date: 09-Jul-2007
			KernelVersion v2.6.22
			Contact: linux-wireless@vger.kernel.org
			Description: This file was deprecated because there no longer was a way to
			claim just control over a single rfkill instance.
			This file was scheduled to be removed in 2012, and was removed
			in 2016.
			Values: 0: Kernel handles events