Merge branch 'sh/evt2irq-migration' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Fri, 18 May 2012 09:13:27 +0000 (18:13 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 18 May 2012 09:13:27 +0000 (18:13 +0900)
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: Paul Mundt <lethal@linux-sh.org>
1  2 
MAINTAINERS
arch/sh/kernel/cpu/sh4a/setup-sh7757.c

diff --cc MAINTAINERS
Simple merge