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

Conflicts:
	arch/arm/mach-s3c64xx/mach-mini6410.c
	arch/arm/mach-s3c64xx/mach-real6410.c
	drivers/video/epson1355fb.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp_hw.h

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

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

diff --cc arch/arm/mach-exynos/mach-smdk4x12.c
index 7a265d1a82d3e6e172799fe2dfc52d16b4217f7c,ee069b47ef262d9d68d279ff05d9098451d59a53..730f1ac65928ed832a52fdb2cf0e8b80f2ae4d60
--- 1/arch/arm/mach-exynos/mach-smdk4x12.c
--- 2/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@@ -33,10 -33,9 +34,9 @@@
  #include <plat/devs.h>
  #include <plat/fb.h>
  #include <plat/gpio-cfg.h>
 -#include <plat/iic.h>
 +#include <linux/platform_data/i2c-s3c2410.h>
  #include <plat/keypad.h>
  #include <plat/mfc.h>
- #include <plat/regs-fb.h>
  #include <plat/regs-serial.h>
  #include <plat/sdhci.h>
  

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

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

diff --cc arch/arm/mach-s3c24xx/mach-smdk2416.c
index db2787aa1e5e7fb5ee61dff9d5c62a861d1d76aa,96478f05fc003096b5875a8429389077cffb6843..f30d7fccbfeedd4e2a22e00703b3933231b03157
--- 1/arch/arm/mach-s3c24xx/mach-smdk2416.c
--- 2/arch/arm/mach-s3c24xx/mach-smdk2416.c
+++ b/arch/arm/mach-s3c24xx/mach-smdk2416.c
@@@ -47,12 -48,11 +48,11 @@@
  #include <plat/clock.h>
  #include <plat/devs.h>
  #include <plat/cpu.h>
 -#include <plat/nand.h>
 +#include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/sdhci.h>
 -#include <plat/udc.h>
 +#include <linux/platform_data/usb-s3c2410_udc.h>
  #include <linux/platform_data/s3c-hsudc.h>
  
- #include <plat/regs-fb-v4.h>
  #include <plat/fb.h>
  
  #include <plat/common-smdk.h>

diff --cc arch/arm/mach-s3c64xx/mach-anw6410.c
index 15c58dfc4584f655b630b45d58798155551a4639,f7a108bafd4cf6928b466c080f4e1c2c79fc2149..99e82ac81b694ce69e27c7e5c8b3a53fc8cef473
--- 1/arch/arm/mach-s3c64xx/mach-anw6410.c
--- 2/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@@ -42,9 -43,8 +43,8 @@@
  #include <asm/mach-types.h>
  
  #include <plat/regs-serial.h>
 -#include <plat/iic.h>
 +#include <linux/platform_data/i2c-s3c2410.h>
  #include <plat/fb.h>
- #include <plat/regs-fb-v4.h>
  
  #include <plat/clock.h>
  #include <plat/devs.h>

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-hmt.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-mini6410.c
index 09311cc40115d7dbf25c40dfe98bd45c5ea0a289,96ebcc5944c3860a45dabd065eeed85e1952cb5c..07c349cca33329fad68fbb253cfa5915e8783237
--- 1/arch/arm/mach-s3c64xx/mach-mini6410.c
--- 2/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@@ -38,12 -38,12 +38,12 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/fb.h>
 -#include <plat/nand.h>
 +#include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/regs-serial.h>
 -#include <plat/ts.h>
 +#include <linux/platform_data/touchscreen-s3c2410.h>
- #include <plat/regs-fb-v4.h>
  
  #include <video/platform_lcd.h>
+ #include <video/samsung_fimd.h>
  
  #include "common.h"
  

diff --cc arch/arm/mach-s3c64xx/mach-ncp.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-real6410.c
index 6daca203e72b3eaea40d0792b0b8fd972918606d,76d3ffbe9a92f59fa9c6bbd1871e2aabdcde0652..7476f7c722ab18d86d7625caa0b5c6e7d41c3b1f
--- 1/arch/arm/mach-s3c64xx/mach-real6410.c
--- 2/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@@ -39,12 -39,12 +39,12 @@@
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/fb.h>
 -#include <plat/nand.h>
 +#include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/regs-serial.h>
 -#include <plat/ts.h>
 +#include <linux/platform_data/touchscreen-s3c2410.h>
- #include <plat/regs-fb-v4.h>
  
  #include <video/platform_lcd.h>
+ #include <video/samsung_fimd.h>
  
  #include "common.h"
  

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index 2547a8846472180016b0bd24e42f4eb53b009b20,d1378d76e1510ec2861b3826cd4c1663ae79a360..da1a771a29e9f1493ce192d35fde34f6fa23ed01
--- 1/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- 2/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -69,10 -70,9 +70,9 @@@
  #include <plat/devs.h>
  #include <plat/cpu.h>
  #include <plat/adc.h>
 -#include <plat/ts.h>
 +#include <linux/platform_data/touchscreen-s3c2410.h>
  #include <plat/keypad.h>
  #include <plat/backlight.h>
- #include <plat/regs-fb-v4.h>
  
  #include "common.h"
  

diff --cc arch/arm/mach-s5p64x0/mach-smdk6440.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/mach-smdk6450.c
Simple merge

diff --cc arch/arm/mach-s5pc100/mach-smdkc100.c
index 5d2c0934928b8b85f63fc525247fad486ef8da2a,c3dcafa559b116ec4a400690910b623f697b329b..dba7384a87bde67d48256dd3e0a95cc61735be55
--- 1/arch/arm/mach-s5pc100/mach-smdkc100.c
--- 2/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@@ -44,14 -45,13 +45,13 @@@
  #include <plat/devs.h>
  #include <plat/cpu.h>
  #include <plat/fb.h>
 -#include <plat/iic.h>
 -#include <plat/ata.h>
 +#include <linux/platform_data/i2c-s3c2410.h>
 +#include <linux/platform_data/ata-samsung_cf.h>
  #include <plat/adc.h>
  #include <plat/keypad.h>
 -#include <plat/ts.h>
 -#include <plat/audio.h>
 +#include <linux/platform_data/touchscreen-s3c2410.h>
 +#include <linux/platform_data/asoc-s3c.h>
  #include <plat/backlight.h>
- #include <plat/regs-fb-v4.h>
  
  #include "common.h"
  

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-smdkv210.c
Simple merge

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

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/Makefile
Simple merge

diff --cc drivers/video/da8xx-fb.c
Simple merge

diff --cc drivers/video/ep93xx-fb.c
Simple merge

diff --cc drivers/video/exynos/exynos_mipi_dsi.c
Simple merge

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

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

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

diff --cc drivers/video/msm/mddi.c
index bf73f048006183da73d75377faddce1d143917d2,d43e178fae273ead19b8707baf3890b47c84ac18..35ac9e8bee63f13a30133382dca3a8f43aa7a25d
--- 1/drivers/video/msm/mddi.c
--- 2/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@@ -26,10 -26,7 +26,7 @@@
  #include <linux/clk.h>
  #include <linux/io.h>
  #include <linux/sched.h>
- #include <mach/msm_iomap.h>
- #include <mach/irqs.h>
- #include <mach/board.h>
 -#include <mach/msm_fb.h>
 +#include <linux/platform_data/video-msm_fb.h>
  #include "mddi_hw.h"
  
  #define FLAG_DISABLE_HIBERNATION 0x0001

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

diff --cc drivers/video/msm/mdp.c
index 2e0f3bab61143410971a45f3686f0796823bdd21,752eff7de3cefd91de8487155d68ee4c1fa905e5..f2566c19e71cb10442e42552e9c492b5a3ba1db8
--- 1/drivers/video/msm/mdp.c
--- 2/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@@ -25,8 -25,7 +25,7 @@@
  #include <linux/major.h>
  #include <linux/slab.h>
  
- #include <mach/msm_iomap.h>
 -#include <mach/msm_fb.h>
 +#include <linux/platform_data/video-msm_fb.h>
  #include <linux/platform_device.h>
  #include <linux/export.h>
  

diff --cc drivers/video/msm/mdp_hw.h
index a0bacf581b32896deb3186168c08808791e733fa,2a841374263056a17e2754c4317c8f896d7efc2d..35848d7410015f60ca5c64272557091cb5dc39a8
--- 1/drivers/video/msm/mdp_hw.h
--- 2/drivers/video/msm/mdp_hw.h
+++ b/drivers/video/msm/mdp_hw.h
@@@ -15,8 -15,7 +15,7 @@@
  #ifndef _MDP_HW_H_
  #define _MDP_HW_H_
  
- #include <mach/msm_iomap.h>
 -#include <mach/msm_fb.h>
 +#include <linux/platform_data/video-msm_fb.h>
  
  struct mdp_info {
        struct mdp_device mdp_dev;

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

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