Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Thu, 21 Jul 2011 06:21:51 +0000 (15:21 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 21 Jul 2011 06:21:51 +0000 (15:21 +0900)
commitfa514fbc57419505d0e9423dbb8742f2775f882e
tree03c7c1fc4e4fb692275f5d8144e59b2872c196a0
parent4af358f81881e1d083a916c9269b5ac0936e180d
parent936a3f770b8de7042d793272f008ef1bb08522e9
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
drivers/video/via/viafbdev.c