Merge tag 'topic/drm-misc-2016-02-12' into drm-intel-next-queued (05fd934b) · Commits · e / devices / android_kernel_fairphone_FP4

.mailmap

+1 −0

Original line number	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 Vasquez <andrew.vasquez@qlogic.com>
		Andy Adamson <andros@citi.umich.edu>
		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
		Archit Taneja <archit@ti.com>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		Arnd Bergmann <arnd@arndb.de>

+19 −0

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

		N: Zach Brown
		E: zab@zabbo.net
		@@ -1507,6 +1508,14 @@ S: 312/107 Canberra Avenue
		S: Griffith, ACT 2603
		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
		E: she@lunetix.de
		D: German Linux Documentation,
		@@ -1847,6 +1856,16 @@ S: Korte Heul 95
		S: 1403 ND BUSSUM
		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
		E: karl@koft.com
		D: Disk usage statistics and modifications to line printer driver

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		What: /config/iio
		Date: October 2015
		KernelVersion: 4.4
		Contact: linux-iio@vger.kernel.org
		Description:
		This represents Industrial IO configuration entry point
		directory. It contains sub-groups corresponding to IIO
		objects.

		What: /config/iio/triggers
		Date: October 2015
		KernelVersion: 4.4
		Description:
		Industrial IO software triggers directory.

		What: /config/iio/triggers/hrtimers
		Date: October 2015
		KernelVersion: 4.4
		Description:
		High resolution timers directory. Creating a directory here
		will result in creating a hrtimer trigger in the IIO subsystem.

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		What: /config/rdma_cm
		Date: November 29, 2015
		KernelVersion: 4.4.0
		Description: Interface is used to configure RDMA-cable HCAs in respect to
		RDMA-CM attributes.

		Attributes are visible only when configfs is mounted. To mount
		configfs in /config directory use:
		# mount -t configfs none /config/

		In order to set parameters related to a specific HCA, a directory
		for this HCA has to be created:
		mkdir -p /config/rdma_cm/<hca>


		What: /config/rdma_cm/<hca>/ports/<port-num>/default_roce_mode
		Date: November 29, 2015
		KernelVersion: 4.4.0
		Description: RDMA-CM based connections from HCA <hca> at port <port-num>
		will be initiated with this RoCE type as default.
		The possible RoCE types are either "IB/RoCE v1" or "RoCE v2".
		This parameter has RW access.

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,3 +10,5 @@ Description:
		isoc_mult - 0..2 (hs/ss only)
		isoc_maxburst - 0..15 (ss only)
		buflen - buffer length
		bulk_qlen - depth of queue for bulk
		iso_qlen - depth of queue for iso