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

Commit 8c57a5e7 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'for-linus' into next

Sync up to bring in wacom_w8001 changes to avoid merge conflicts later.
parents 0bb11e96 6a5029e6
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -33,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>
@@ -47,6 +48,9 @@ Felix Kuhling <fxkuehl@gmx.de>
Felix Moeller <felix@derklecks.de>
Felix Moeller <felix@derklecks.de>
Filipe Lautert <filipe@icewall.org>
Filipe Lautert <filipe@icewall.org>
Franck Bui-Huu <vagabon.xyz@gmail.com>
Franck Bui-Huu <vagabon.xyz@gmail.com>
Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
Frank Zago <fzago@systemfabricworks.com>
Frank Zago <fzago@systemfabricworks.com>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <gregkh@suse.de>
Greg Kroah-Hartman <gregkh@suse.de>
@@ -65,6 +69,7 @@ Jean Tourrilhes <jt@hpl.hp.com>
Jeff Garzik <jgarzik@pretzel.yyz.us>
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 Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
John Stultz <johnstul@us.ibm.com>
John Stultz <johnstul@us.ibm.com>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@freedesktop.org>
<josh@joshtriplett.org> <josh@kernel.org>
<josh@joshtriplett.org> <josh@kernel.org>
@@ -78,6 +83,7 @@ Kay Sievers <kay.sievers@vrfy.org>
Kenneth W Chen <kenneth.w.chen@intel.com>
Kenneth W Chen <kenneth.w.chen@intel.com>
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
Koushik <raghavendra.koushik@neterion.com>
Koushik <raghavendra.koushik@neterion.com>
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Leonid I Ananiev <leonid.i.ananiev@intel.com>
Leonid I Ananiev <leonid.i.ananiev@intel.com>
Linas Vepstas <linas@austin.ibm.com>
Linas Vepstas <linas@austin.ibm.com>
+1 −0
Original line number Original line Diff line number Diff line
@@ -3054,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
+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.
+13 −0
Original line number Original line Diff line number Diff line
@@ -2,28 +2,12 @@ rfkill - radio frequency (RF) connector kill switch support


For details to this subsystem look at Documentation/rfkill.txt.
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
What:		/sys/class/rfkill/rfkill[0-9]+/claim
Date:		09-Jul-2007
Date:		09-Jul-2007
KernelVersion	v2.6.22
KernelVersion	v2.6.22
Contact:	linux-wireless@vger.kernel.org
Contact:	linux-wireless@vger.kernel.org
Description:	This file is deprecated because there no longer is a way to
Description:	This file was deprecated because there no longer was a way to
		claim just control over a single rfkill instance.
		claim just control over a single rfkill instance.
		This file is scheduled to be removed in 2012.
		This file was scheduled to be removed in 2012, and was removed
		in 2016.
Values: 	0: Kernel handles events
Values: 	0: Kernel handles events
+2 −1
Original line number Original line Diff line number Diff line
@@ -100,4 +100,5 @@ Description:


Users:		libraw1394
Users:		libraw1394
		libdc1394
		libdc1394
		tools like jujuutils, fwhack, ...
		libhinawa
		tools like linux-firewire-utils, fwhack, ...
Loading