Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1dbccc3 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'sh/evt2irq-migration' into sh-latest 



Conflicts:
	arch/sh/kernel/cpu/sh3/setup-sh770x.c
	arch/sh/kernel/cpu/sh3/setup-sh7710.c
	arch/sh/kernel/cpu/sh3/setup-sh7720.c
	arch/sh/kernel/cpu/sh4/setup-sh7750.c
	arch/sh/kernel/cpu/sh4a/setup-sh7343.c
	arch/sh/kernel/cpu/sh4a/setup-sh7366.c
	arch/sh/kernel/cpu/sh4a/setup-sh7722.c
	arch/sh/kernel/cpu/sh4a/setup-sh7723.c
	arch/sh/kernel/cpu/sh4a/setup-sh7724.c
	arch/sh/kernel/cpu/sh4a/setup-sh7757.c
	arch/sh/kernel/cpu/sh4a/setup-sh7763.c
	arch/sh/kernel/cpu/sh4a/setup-sh7770.c
	arch/sh/kernel/cpu/sh4a/setup-sh7785.c
	arch/sh/kernel/cpu/sh4a/setup-sh7786.c

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 00d6025e 58796ce6

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -539,3 +539,13 @@ When: 3.6 
Why:	setitimer is not returning -EFAULT if user pointer is NULL. This

	violates the spec.

Who:	Sasikantha Babu <sasikanth.v19@gmail.com>



----------------------------



What:	V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls

When:	3.7

Why:	The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated

	for about 4 years and they are not used by any mainline driver.

	There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide

	similar	functionality.

Who:	Sylwester Nawrocki <sylvester.nawrocki@gmail.com>

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -1968,7 +1968,9 @@ S: Maintained 
F:	drivers/net/ethernet/ti/cpmac.c



CPU FREQUENCY DRIVERS

M:	Rafael J. Wysocki <rjw@sisk.pl>

L:	cpufreq@vger.kernel.org

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	drivers/cpufreq/

F:	include/linux/cpufreq.h
@@ -4034,6 +4036,7 @@ F: Documentation/scsi/53c700.txt 
F:	drivers/scsi/53c700*



LED SUBSYSTEM

M:	Bryan Wu <bryan.wu@canonical.com>

M:	Richard Purdie <rpurdie@rpsys.net>

S:	Maintained

F:	drivers/leds/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ config MACH_ARMLEX4210 
config MACH_UNIVERSAL_C210

	bool "Mobile UNIVERSAL_C210 Board"

	select CPU_EXYNOS4210

	select S5P_HRT

	select CLKSRC_MMIO

	select HAVE_SCHED_CLOCK

	select S5P_GPIO_INT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

arch/arm/mach-exynos/clock-exynos5.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static struct clk exynos5_clk_pdma1 = { 
	.name		= "dma",

	.devname	= "dma-pl330.1",

	.enable		= exynos5_clk_ip_fsys_ctrl,

	.ctrlbit	= (1 << 1),

	.ctrlbit	= (1 << 2),

};



static struct clk exynos5_clk_mdma1 = {