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)
1  2 
drivers/video/via/viafbdev.c

Simple merge