Merge branch 'rmobile-fixes-for-linus' into rmobile-latest (17f0056e) · Commits · e / devices / android_kernel_fairphone_FP3

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Koushik <raghavendra.koushik@neterion.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Mark Brown <broonie@sirena.org.uk>
		@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yusuke Goda <goda.yusuke@renesas.com>

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -349,6 +349,7 @@ STAC92HD83*
		ref Reference board
		mic-ref Reference board with power management for ports
		dell-s14 Dell laptop
		dell-vostro-3500 Dell Vostro 3500 laptop
		hp HP laptops with (inverted) mute-LED
		hp-dv7-4000 HP dv-7 4000
		auto BIOS setup (default)

Documentation/sound/alsa/HD-Audio.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -579,7 +579,7 @@ Development Tree
		~~~~~~~~~~~~~~~~
		The latest development codes for HD-audio are found on sound git tree:

		- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
		- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git

		The master branch or for-next branches can be used as the main
		development branches in general while the HD-audio specific patches
		@@ -594,7 +594,7 @@ is, installed via the usual spells: configure, make and make
		install(-modules). See INSTALL in the package. The snapshot tarballs
		are found at:

		- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/
		- ftp://ftp.suse.com/pub/people/tiwai/snapshot/


		Sending a Bug Report
		@@ -696,7 +696,7 @@ via hda-verb won't change the mixer value.

		The hda-verb program is found in the ftp directory:

		- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
		- ftp://ftp.suse.com/pub/people/tiwai/misc/

		Also a git repository is available:

		@@ -764,7 +764,7 @@ operation, the jack plugging simulation, etc.

		The package is found in:

		- ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/misc/
		- ftp://ftp.suse.com/pub/people/tiwai/misc/

		A git repository is available:

Kbuild

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ always += missing-syscalls
		targets += missing-syscalls

		quiet_cmd_syscalls = CALL $<
		cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags)
		cmd_syscalls = $(CONFIG_SHELL) $< $(CC) $(c_flags) $(missing_syscalls_flags)

		missing-syscalls: scripts/checksyscalls.sh $(offsets-file) FORCE
		$(call cmd,syscalls)

MAINTAINERS

+12 −2

Original line number	Diff line number	Diff line
		@@ -1106,6 +1106,7 @@ F: drivers/media/video/s5p-fimc/
		ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
		M: Kyungmin Park <kyungmin.park@samsung.com>
		M: Kamil Debski <k.debski@samsung.com>
		M: Jeongtae Park <jtp.park@samsung.com>
		L: linux-arm-kernel@lists.infradead.org
		L: linux-media@vger.kernel.org
		S: Maintained
		@@ -1929,6 +1930,7 @@ CONTROL GROUPS (CGROUPS)
		M: Paul Menage <paul@paulmenage.org>
		M: Li Zefan <lizf@cn.fujitsu.com>
		L: containers@lists.linux-foundation.org
		L: cgroups@vger.kernel.org
		S: Maintained
		F: include/linux/cgroup*
		F: kernel/cgroup*
		@@ -2342,6 +2344,13 @@ S: Supported
		F: drivers/gpu/drm/i915
		F: include/drm/i915*

		DRM DRIVERS FOR EXYNOS
		M: Inki Dae <inki.dae@samsung.com>
		L: dri-devel@lists.freedesktop.org
		S: Supported
		F: drivers/gpu/drm/exynos
		F: include/drm/exynos*

		DSCC4 DRIVER
		M: Francois Romieu <romieu@fr.zoreil.com>
		L: netdev@vger.kernel.org
		@@ -4296,6 +4305,7 @@ MEMORY RESOURCE CONTROLLER
		M: Balbir Singh <bsingharora@gmail.com>
		M: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
		M: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
		L: cgroups@vger.kernel.org
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/memcontrol.c
		@@ -4329,7 +4339,7 @@ MIPS
		M: Ralf Baechle <ralf@linux-mips.org>
		L: linux-mips@linux-mips.org
		W: http://www.linux-mips.org/
		T: git git://git.linux-mips.org/pub/scm/linux.git
		T: git git://git.linux-mips.org/pub/scm/ralf/linux.git
		Q: http://patchwork.linux-mips.org/project/linux-mips/list/
		S: Supported
		F: Documentation/mips/
		@@ -6122,7 +6132,7 @@ F: sound/
		SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
		M: Liam Girdwood <lrg@ti.com>
		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		W: http://alsa-project.org/main/index.php/ASoC
		S: Supported