Merge branch 'renesas/cleanup2' into next/soc

This change “Merge branch 'renesas/cleanup2' into next/soc” (commit e1ddcde) in Linux kernel is authored by Olof Johansson <olof [at]> on Sat Jul 12 09:43:40 2014 -0700.

Description of "Merge branch 'renesas/cleanup2' into next/soc"

The change “Merge branch 'renesas/cleanup2' into next/soc” introduces changes as follows.

Merge branch 'renesas/cleanup2' into next/soc

Merging in as base to resolve a merge conflict with later soc branch

Linux kernel releases containing commit e1ddcde

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "Merge branch 'renesas/cleanup2' into next/soc"

There are 2 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 arch/arm/mach-mvebu/cpu-reset.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/cpu-reset.c b/arch/arm/mach-mvebu/cpu-reset.c
index 4a8f9eebebea..60fb53787004 100644
--- a/arch/arm/mach-mvebu/cpu-reset.c
+++ b/arch/arm/mach-mvebu/cpu-reset.c
@@ -67,7 +67,7 @@ static int mvebu_cpu_reset_map(struct device_node *np, int res_idx)
 	return 0;
-int __init mvebu_cpu_reset_init(void)
+static int __init mvebu_cpu_reset_init(void)
 	struct device_node *np;
 	int res_idx;

The commit for this change in Linux stable tree is e1ddcde (patch).

Last modified: 2020/02/10