Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 10 Nov 2010 03:04:41 +0000 (12:04 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 10 Nov 2010 03:04:41 +0000 (12:04 +0900)
1  2 
drivers/video/via/via-core.c
include/linux/via-core.h

Simple merge
Simple merge