Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-fixes...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 19 Apr 2011 06:49:36 +0000 (15:49 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 19 Apr 2011 06:49:36 +0000 (15:49 +0900)

Trivial merge