Paul Mundt 15893fb565 Merge branch 'sh/sdhi-mfd' ... Conflicts: arch/sh/boards/mach-ecovec24/setup.c arch/sh/boards/mach-kfr2r09/setup.c		2009-10-26 10:47:44 +09:00
..
Makefile
setup.c	Merge branch 'sh/sdhi-mfd'	2009-10-26 10:47:44 +09:00