Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Paul Mundt [Wed, 22 Dec 2010 03:56:10 +0000 (12:56 +0900)]
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge