Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 22 Dec 2010 03:56:10 +0000 (12:56 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 22 Dec 2010 03:56:10 +0000 (12:56 +0900)
commit7ccbefe07ea0a3570e44d1ec13a307552ee4dadd
treeba0299694a9f3940f289b6a29cadab853906e3d2
parent623eb15647fc35c5a8cd38985d5958240eb072c1
parent90a8a73c06cc32b609a880d48449d7083327e11a
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
arch/arm/mach-shmobile/board-ap4evb.c
drivers/video/modedb.c
drivers/video/mx3fb.c
drivers/video/sh_mobile_lcdcfb.c
include/linux/fb.h