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

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	drivers/video/omap/lcd_apollon.c
	drivers/video/omap/lcd_ldp.c
	drivers/video/omap/lcd_overo.c

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f3917b3e12d6b8f8946f19c102f0be1201c6ece6,d3874a68b059b382fe64caae0482da155d00fdcc..4d0c8b9c644a2ded801f450cd37eb0c9a7f5ff86
--- 1/arch/arm/mach-omap2/board-4430sdp.c
--- 2/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -381,14 -379,12 +379,6 @@@ static struct platform_device *sdp4430_
        &sdp4430_vbat,
  };
  
- static struct omap_lcd_config sdp4430_lcd_config __initdata = {
-       .ctrl_name      = "internal",
- };
- 
- static struct omap_board_config_kernel sdp4430_config[] __initdata = {
-       { OMAP_TAG_LCD,         &sdp4430_lcd_config },
- };
 -static void __init omap_4430sdp_init_early(void)
 -{
 -      omap2_init_common_infrastructure();
 -      omap2_init_common_devices(NULL, NULL);
 -}
--
  static struct omap_musb_board_data musb_board_data = {
        .interface_type         = MUSB_INTERFACE_UTMI,
        .mode                   = MUSB_OTG,

diff --cc arch/arm/mach-omap2/board-am3517evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

diff --cc arch/arm/mach-omap2/board-devkit8000.c
Simple merge

diff --cc arch/arm/mach-omap2/board-igep0020.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3stalker.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge