Merge branch 'fixes-omap3' into fixes (500050f0) · Commits · jan.koester / Linux

.mailmap

+7 −1

CREDITS

+50 −26

Original line number	Original line	Diff line number	Diff line
	@@ -740,6 +740,11 @@ S: (ask for current address)
	S: Portland, Oregon		S: Portland, Oregon
	S: USA		S: USA

			N: Jason Cooper
			D: ARM/Marvell SOC co-maintainer
			D: irqchip co-maintainer
			D: MVEBU PCI DRIVER co-maintainer

	N: Robin Cornelius		N: Robin Cornelius
	E: robincornelius@users.sourceforge.net		E: robincornelius@users.sourceforge.net
	D: Ralink rt2x00 WLAN driver		D: Ralink rt2x00 WLAN driver
	@@ -849,6 +854,12 @@ D: trivial hack to add variable address length routing to Rose.
	D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO		D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
	D: ax25-utils maintainer.		D: ax25-utils maintainer.

			N: Kamil Debski
			E: kamil@wypas.org
			D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
			D: Samsung USB2 phy drivers
			D: PWM fan driver

	N: Helge Deller		N: Helge Deller
	E: deller@gmx.de		E: deller@gmx.de
	W: http://www.parisc-linux.org/		W: http://www.parisc-linux.org/
	@@ -1910,6 +1921,15 @@ S: 660 Harvard Ave. #7
	S: Santa Clara, CA 95051		S: Santa Clara, CA 95051
	S: USA		S: USA

			N: Kukjin Kim
			E: kgene@kernel.org
			D: Samsung S3C, S5P and Exynos ARM architectures

			N: Sangbeom Kim
			E: sbkim73@samsung.com
			D: Samsung SoC Audio (ASoC) drivers
			D: Samsung PMIC (RTC, regulators, MFD) drivers

	N: Russell King		N: Russell King
	E: rmk@arm.linux.org.uk		E: rmk@arm.linux.org.uk
	D: Linux/arm integrator, maintainer & hacker		D: Linux/arm integrator, maintainer & hacker
	@@ -2843,6 +2863,10 @@ D: IPX development and support
	N: Venkatesh Pallipadi (Venki)		N: Venkatesh Pallipadi (Venki)
	D: x86/HPET		D: x86/HPET

			N: Kyungmin Park
			E: kyungmin.park@samsung.com
			D: Samsung S5Pv210 and Exynos4210 mobile platforms

	N: David Parsons		N: David Parsons
	E: orc@pell.chi.il.us		E: orc@pell.chi.il.us
	D: improved memory detection code.		D: improved memory detection code.

Documentation/ABI/README

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,14 @@ Users: All users of this interface who wish to be notified when
	be changed further.		be changed further.


			Note:
			The fields should be use a simple notation, compatible with ReST markup.
			Also, the file should not have a top-level index, like::

			===
			foo
			===

	How things move between levels:		How things move between levels:

	Interfaces in stable may move to obsolete, as long as the proper		Interfaces in stable may move to obsolete, as long as the proper

Documentation/ABI/obsolete/sysfs-class-dax

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -8,10 +8,10 @@ Description: Device DAX is the device-centric analogue of Filesystem
	system. Device DAX is strict, precise and predictable.		system. Device DAX is strict, precise and predictable.
	Specifically this interface:		Specifically this interface:

	1/ Guarantees fault granularity with respect to a given		1. Guarantees fault granularity with respect to a given
	page size (pte, pmd, or pud) set at configuration time.		page size (pte, pmd, or pud) set at configuration time.

	2/ Enforces deterministic behavior by being strict about		2. Enforces deterministic behavior by being strict about
	what fault scenarios are supported.		what fault scenarios are supported.

	The /sys/class/dax/ interface enumerates all the		The /sys/class/dax/ interface enumerates all the

Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7,10 +7,13 @@ Description: It is possible to switch the cpi setting of the mouse with the
	setting reported by the mouse. This number has to be further		setting reported by the mouse. This number has to be further
	processed to receive the real dpi value:		processed to receive the real dpi value:

			===== ====
	VALUE DPI		VALUE DPI
			===== ====
	1 400		1 400
	2 800		2 800
	4 1600		4 1600
			===== ====

	This file is readonly.		This file is readonly.
	Has never been used. If bookkeeping is done, it's done in userland tools.		Has never been used. If bookkeeping is done, it's done in userland tools.

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
	<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>		Dmitry Baryshkov <dbaryshkov@gmail.com>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
	@@ -287,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
	Sarangdhar Joshi <spjoshi@codeaurora.org>		Sarangdhar Joshi <spjoshi@codeaurora.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
			Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
	Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>		Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
	Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
	Sebastian Reichel <sre@kernel.org> <sre@debian.org>		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
	@@ -318,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
			Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
			Uwe Kleine-König <ukleinek@strlen.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>