Merge branch 'sh/sdhi-mfd'
authorPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000 (10:47 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 26 Oct 2009 01:47:44 +0000 (10:47 +0900)
Conflicts:
arch/sh/boards/mach-ecovec24/setup.c
arch/sh/boards/mach-kfr2r09/setup.c


Trivial merge