Merge branches 'rmobile/fbdev' and 'common/fbdev-edid' of master.kernel.org:/pub...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 16 Nov 2010 07:25:35 +0000 (16:25 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 16 Nov 2010 07:25:35 +0000 (16:25 +0900)

Trivial merge