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

Commit ae745302 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-rc1' into omap-for-v4.2/fixes

parents e3abe255 22a5dc10
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch>
Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com>
Michel Dänzer <michel@tungstengraphics.com>
Mitesh shah <mshah@teja.com>
Mitesh shah <mshah@teja.com>
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
Morten Welinder <terra@gnome.org>
Morten Welinder <terra@gnome.org>
Morten Welinder <welinder@anemone.rentec.com>
Morten Welinder <welinder@anemone.rentec.com>
Morten Welinder <welinder@darter.rentec.com>
Morten Welinder <welinder@darter.rentec.com>
@@ -95,10 +96,12 @@ Patrick Mochel <mochel@digitalimplant.org>
Peter A Jonsson <pj@ludd.ltu.se>
Peter A Jonsson <pj@ludd.ltu.se>
Peter Oruba <peter@oruba.de>
Peter Oruba <peter@oruba.de>
Peter Oruba <peter.oruba@amd.com>
Peter Oruba <peter.oruba@amd.com>
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
Praveen BP <praveenbp@ti.com>
Praveen BP <praveenbp@ti.com>
Rajesh Shah <rajesh.shah@intel.com>
Rajesh Shah <rajesh.shah@intel.com>
Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle <ralf@linux-mips.org>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
Rémi Denis-Courmont <rdenis@simphalempin.com>
Rémi Denis-Courmont <rdenis@simphalempin.com>
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Rudolf Marek <R.Marek@sh.cvut.cz>
Rudolf Marek <R.Marek@sh.cvut.cz>
+11 −5
Original line number Original line Diff line number Diff line
@@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B
S: Valladolid 47009
S: Valladolid 47009
S: Spain
S: Spain


N: Jens Osterkamp
E: jens@de.ibm.com
D: Maintainer of Spidernet network driver for Cell

N: Gadi Oxman
N: Gadi Oxman
E: gadio@netvision.net.il
E: gadio@netvision.net.il
D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
@@ -3219,11 +3223,6 @@ N: Dipankar Sarma
E: dipankar@in.ibm.com
E: dipankar@in.ibm.com
D: RCU
D: RCU


N: Yoshinori Sato
E: ysato@users.sourceforge.jp
D: uClinux for Renesas H8/300 (H8300)
D: http://uclinux-h8.sourceforge.jp/

N: Hannu Savolainen
N: Hannu Savolainen
E: hannu@opensound.com
E: hannu@opensound.com
D: Maintainer of the sound drivers until 2.1.x days.
D: Maintainer of the sound drivers until 2.1.x days.
@@ -3709,6 +3708,13 @@ N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group
D: Co-founder of Berlin Linux User Group


N: Andrew Victor
E: linux@maxim.org.za
W: http://maxim.org.za/at91_26.html
D: First maintainer of Atmel ARM-based SoC, aka AT91
D: Introduced support for at91rm9200, the first chip of AT91 family
S: South Africa

N: Riku Voipio
N: Riku Voipio
E: riku.voipio@iki.fi
E: riku.voipio@iki.fi
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
D: Author of PCA9532 LED and Fintek f75375s hwmon driver
+11 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/w1/devices/.../w1_master_timeout_us
Date:		April 2015
Contact:	Dmitry Khromov <dk@icelogic.net>
Description:	Bus scanning interval, microseconds component.
		Some of 1-Wire devices commonly associated with physical access
		control systems are attached/generate presence for as short as
		100 ms - hence the tens-to-hundreds milliseconds scan intervals
		are required.
		see Documentation/w1/w1.generic for detailed information.
Users:		any user space application which wants to know bus scanning
		interval
+6 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/w1/devices/.../w1_seq
Date:		Apr 2015
Contact:	Matt Campbell <mattrcampbell@gmail.com>
Description:	Support for the DS28EA00 chain sequence function
		see Documentation/w1/slaves/w1_therm for detailed information
Users:		any user space application which wants to communicate with DS28EA00
+1 −1
Original line number Original line Diff line number Diff line
What:		/config/pcie-gadget
What:		/config/pcie-gadget
Date:		Feb 2011
Date:		Feb 2011
KernelVersion:	2.6.37
KernelVersion:	2.6.37
Contact:	Pratyush Anand <pratyush.anand@st.com>
Contact:	Pratyush Anand <pratyush.anand@gmail.com>
Description:
Description:


	Interface is used to configure selected dual mode PCIe controller
	Interface is used to configure selected dual mode PCIe controller
Loading