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

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_fimd.c
Simple merge

diff --cc drivers/video/msm/mdp.c
Simple merge

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