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

Merge branch 'perf/urgent' into perf/core 



Merge reason: Add these cherry-picked commits so that future changes
              on perf/core don't conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 9dde9dc0 ddf6e0e5

.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)

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

+9 −1
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
@@ -2342,6 +2343,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
@@ -6122,7 +6130,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

arch/arm/boot/dts/tegra-ventana.dts

+1 −2
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
	sdhci@c8000400 {

		cd-gpios = <&gpio 69 0>; /* gpio PI5 */

		wp-gpios = <&gpio 57 0>; /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

	};



	sdhci@c8000600 {

		power-gpios = <&gpio 70 0>; /* gpio PI6 */

		support-8bit;

	};

};