From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 18 May 2012 09:13:27 +0000 (+0900)
Subject: Merge branch 'sh/evt2irq-migration' into sh-latest
X-Git-Tag: firefly_0821_release~3680^2~2812^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c1dbccc3c7cc70e8211a7ad6ba55ecbc18e77a5a;p=firefly-linux-kernel-4.4.55.git

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

c1dbccc3c7cc70e8211a7ad6ba55ecbc18e77a5a