Merge branch 'sh/sdhi-mfd'

Conflicts:
	arch/sh/boards/mach-ecovec24/setup.c
	arch/sh/boards/mach-kfr2r09/setup.c
This commit is contained in:
Paul Mundt 2009-10-26 10:47:44 +09:00
commit 15893fb565
9 changed files with 355 additions and 50 deletions