linux-next: manual merge of the arm-soc tree with the fbdev tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/msm/mdp_hw.h between commit 8abf0b31e161 ("video: msm: Remove useless mach/* includes") from the fbdev tree and commit 1ef21f6343ff ("ARM: msm: move platform_data definitions") from the arm-soc tree. I fixed it u

linux-next: manual merge of the arm-soc tree with the fbdev tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in drivers/video/msm/mdp_hw.h between commit 8abf0b31e161 ("video: msm: Remove useless mach/* includes") from the fbdev tree and commit 1ef21f6343ff ("ARM: msm: move platform_data definitions") from the arm-soc tree. I fixed it u

linux-next: manual merge of the arm-soc tree with the fbdev tree

Hi all, Today's linux-next merge of the arm-soc tree got conflicts in drivers/video/msm/mddi.c, drivers/video/msm/mdp.c and drivers/video/msm/mdp_hw.h between commit 8abf0b31e161 ("video: msm: Remove useless mach/* includes") from the fbdev tree and commit 1ef21f6343ff ("ARM: msm: move platform_da

linux-next: manual merge of the arm-soc tree with the fbdev tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c64xx/mach-real6410.c between commit 5a213a55c6d3 ("include/video: move fimd register headers from platform to include/video") from the fbdev tree and commit 436d42c61c3e ("ARM: samsung: move platform_data defin

linux-next: manual merge of the arm-soc tree with the fbdev tree

Hi all, Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-s3c64xx/mach-mini6410.c between commit 5a213a55c6d3 ("include/video: move fimd register headers from platform to include/video") from the fbdev tree and commit 436d42c61c3e ("ARM: samsung: move platform_data d