Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 16 Mar 2011 09:07:16 +0000 (18:07 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 16 Mar 2011 09:07:16 +0000 (18:07 +0900)

Trivial merge