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)
commitdc7c0b6a6d28b0de231728de963ed53a9cee85cf
treee7d4deeaba1ea8f905f1bb2be42cc47b4441eb97
parentd6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf
parentb884a94ed16d1a633e76f80fb1bd75d0e7373ce3
Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6
drivers/video/via/via-core.c
include/linux/via-core.h