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