Merge branch 'for-linus' into for-next (527c465a) · Commits · e / devices / android_kernel_fairphone_FP3

.mailmap

+7 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Mitesh shah <mshah@teja.com>
		Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
		Morten Welinder <terra@gnome.org>
		Morten Welinder <welinder@anemone.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 Oruba <peter@oruba.de>
		Peter Oruba <peter.oruba@amd.com>
		Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
		Praveen BP <praveenbp@ti.com>
		Rajesh Shah <rajesh.shah@intel.com>
		Ralf Baechle <ralf@linux-mips.org>
		Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
		Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
		Rémi Denis-Courmont <rdenis@simphalempin.com>
		Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		@@ -113,6 +116,7 @@ Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		@@ -122,7 +126,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yusuke Goda <goda.yusuke@renesas.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>

CREDITS

+4 −5

Original line number	Diff line number	Diff line
		@@ -2740,6 +2740,10 @@ S: C/ Mieses 20, 9-B
		S: Valladolid 47009
		S: Spain

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

		N: Gadi Oxman
		E: gadio@netvision.net.il
		D: Original author and maintainer of IDE/ATAPI floppy/tape drivers
		@@ -3219,11 +3223,6 @@ N: Dipankar Sarma
		E: dipankar@in.ibm.com
		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
		E: hannu@opensound.com
		D: Maintainer of the sound drivers until 2.1.x days.

Documentation/ABI/stable/sysfs-bus-w1

0 → 100644

+11 −0

Original line number	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

Documentation/ABI/stable/sysfs-driver-w1_ds28ea00

0 → 100644

+6 −0

Original line number	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

Documentation/ABI/testing/configfs-spear-pcie-gadget

+1 −1

Original line number	Diff line number	Diff line
		What: /config/pcie-gadget
		Date: Feb 2011
		KernelVersion: 2.6.37
		Contact: Pratyush Anand <pratyush.anand@st.com>
		Contact: Pratyush Anand <pratyush.anand@gmail.com>
		Description:

		Interface is used to configure selected dual mode PCIe controller