Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc drivers/video/modedb.c
Simple merge

diff --cc drivers/video/mx3fb.c
Simple merge

diff --cc drivers/video/sh_mobile_lcdcfb.c
Simple merge

diff --cc include/linux/fb.h
Simple merge