Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 May 2011 06:49:57 +0000 (15:49 +0900)

Trivial merge