Commit a787bdaf authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to resolve semantic conflict 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2914b0ba 85a2c56c

.mailmap

+4 −1
Original line number 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@mips.com>

<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> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

CREDITS

+45 −26
Original line number Diff line number Diff line
@@ -849,6 +849,12 @@ D: trivial hack to add variable address length routing to Rose. 
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO

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

E: deller@gmx.de

W: http://www.parisc-linux.org/
@@ -1910,6 +1916,15 @@ S: 660 Harvard Ave. #7 
S: Santa Clara, CA 95051

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

E: rmk@arm.linux.org.uk

D: Linux/arm integrator, maintainer & hacker
@@ -2843,6 +2858,10 @@ D: IPX development and support 
N: Venkatesh Pallipadi (Venki)

D: x86/HPET



N: Kyungmin Park

E: kyungmin.park@samsung.com

D: Samsung S5Pv210 and Exynos4210 mobile platforms



N: David Parsons

E: orc@pell.chi.il.us

D: improved memory detection code.

Documentation/ABI/README

+9 −1
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ Users: All users of this interface who wish to be notified when 
		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:



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

Documentation/ABI/obsolete/sysfs-class-dax

+4 −4
Original line number 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.

		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.



		2/ Enforces deterministic behavior by being strict about

		2. Enforces deterministic behavior by being strict about

		   what fault scenarios are supported.



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

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

+3 −0
Original line number 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

		processed to receive the real dpi value:



		===== ====

		VALUE DPI

		===== ====

		1     400

		2     800

		4     1600

		===== ====



		This file is readonly.

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