Merge branch 'common/fbdev-meram' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaul Mundt <lethal@linux-sh.org>
Fri, 24 Jun 2011 08:00:57 +0000 (17:00 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 24 Jun 2011 08:00:57 +0000 (17:00 +0900)

Trivial merge