Merge branch 'rmobile/mmcif' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 25 Nov 2010 07:45:43 +0000 (16:45 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 25 Nov 2010 07:45:43 +0000 (16:45 +0900)
commit1ad2096c4eba144522d87541c4024b8c84e95051
treea149d469a4da72a7b6e6b777879b740046c4ebc9
parentc4d73e7d75a54451d6e073c118ba2b8d87bd350d
parentdf73af86b6e737f357aae85e0b5e621516117780
Merge branch 'rmobile/mmcif' into rmobile-latest
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/clock-sh7372.c