Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 24 Mar 2011 22:52:38 +0000 (07:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 24 Mar 2011 22:52:38 +0000 (07:52 +0900)

Trivial merge