Merge remote-tracking branch 'fbdev/for-next'

diff --cc arch/arm/mach-at91/board-sam9263ek.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/amba-clcd.c
Simple merge

diff --cc drivers/video/mmp/hw/mmp_ctrl.c
Simple merge

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

diff --cc drivers/video/omap2/dss/dispc.c
Simple merge

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