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)
Conflicts:
drivers/sh/intc/dynamic.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Trivial merge