Merge branch 'for-l-o-3.5'

Conflicts:
	drivers/video/omap2/displays/panel-taal.c

Merge OMAP DSS related board file changes. The branch will also be
merged through linux-omap tree to solve conflicts.

diff --cc drivers/video/omap2/displays/panel-taal.c
index 3053399faf9afe48bd93f161daa82661d6d4e75d,b2dd88b484209b46f5b213e9007cb2108b438c34..2ce9992f403b838efababfbc9a7ec7e65a13e533
--- 1/drivers/video/omap2/displays/panel-taal.c
--- 2/drivers/video/omap2/displays/panel-taal.c
+++ b/drivers/video/omap2/displays/panel-taal.c
@@@ -992,8 -1082,13 +1001,11 @@@ err_gpio
        if (bldev != NULL)
                backlight_device_unregister(bldev);
  err_bl:
+       if (gpio_is_valid(panel_data->reset_gpio))
+               gpio_free(panel_data->reset_gpio);
+ err_rst_gpio:
        destroy_workqueue(td->workqueue);
  err_wq:
 -      free_regulators(panel_config->regulators, panel_config->num_regulators);
 -err_reg:
        kfree(td);
  err:
        return r;
@@@ -1030,6 -1125,12 +1042,9 @@@ static void __exit taal_remove(struct o
        /* reset, to be sure that the panel is in a valid state */
        taal_hw_reset(dssdev);
  
 -      free_regulators(td->panel_config->regulators,
 -                      td->panel_config->num_regulators);
 -
+       if (gpio_is_valid(panel_data->reset_gpio))
+               gpio_free(panel_data->reset_gpio);
+ 
        kfree(td);
  }
  

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

diff --cc include/video/omapdss.h
Simple merge