Merge branch 'fbdev/edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev...
authorPaul Mundt <lethal@linux-sh.org>
Mon, 15 Nov 2010 05:57:49 +0000 (14:57 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 15 Nov 2010 05:57:49 +0000 (14:57 +0900)

Trivial merge