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)
commitc1dbccc3c7cc70e8211a7ad6ba55ecbc18e77a5a
tree570fbd1ab42d12257a820460fae0e6e7bc891900
parent00d6025e58c6e3b229e28cab721c568af5b1ae05
parent58796ce67a80e8725220af83c5a550bf6a4dab12
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: Paul Mundt <lethal@linux-sh.org>
MAINTAINERS
arch/sh/kernel/cpu/sh4a/setup-sh7757.c