Merge branch 'rmobile/fbdev' into rmobile-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 26 May 2011 06:05:21 +0000 (15:05 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 26 May 2011 06:05:21 +0000 (15:05 +0900)
commitdce65a6a92f34fbc425ffb4302f8e747d89c9792
tree7c596c3cc92eba6444bf27c75e03e5531656b179
parent4db70f73e56961b9bcdfd0c36c62847a18b7dbb5
parent1c7fcbed1adee44708dafb65ac40b186c203d7e8
Merge branch 'rmobile/fbdev' into rmobile-latest
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c