Merge branch 'sh/dynamic-irq-cleanup' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Wed, 13 Jun 2012 03:12:41 +0000 (12:12 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 13 Jun 2012 03:12:41 +0000 (12:12 +0900)
commitd978006a54ddf73cdeb3c59d1862a17f4445751c
tree407e4e37402936ef2c06bee64d8575390c3339f6
parentf21efd45362d555b3b93960a5736ad7c6fc1f367
parent123df01e8e046d6065089e1bff29aa3fc48d4420
Merge branch 'sh/dynamic-irq-cleanup' into sh-latest

Conflicts:
drivers/sh/intc/dynamic.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/boards/Kconfig
arch/sh/boards/mach-se/7722/setup.c
arch/sh/include/mach-se/mach/se7343.h
arch/sh/include/mach-se/mach/se7722.h