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

Conflicts:
	drivers/video/of_display_timing.c

diff --cc drivers/video/of_display_timing.c
index 2894e0300a33fb8676a7ca8f12b913b5b99ad76b,9c0f17b2e6fb59309449e5a62b99925c23d511da..171821ddd78de381a866e9912bece023a8fcaca5
--- 1/drivers/video/of_display_timing.c
--- 2/drivers/video/of_display_timing.c
+++ b/drivers/video/of_display_timing.c
@@@ -53,13 -53,12 +53,12 @@@ static int parse_timing_property(const 
  }
  
  /**
-  * of_get_display_timing - parse display_timing entry from device_node
+  * of_parse_display_timing - parse display_timing entry from device_node
   * @np: device_node with the properties
   **/
- static struct display_timing *of_get_display_timing(const struct device_node
-                                                   *np)
 -static int of_parse_display_timing(struct device_node *np,
++static int of_parse_display_timing(const struct device_node *np,
+               struct display_timing *dt)
  {
-       struct display_timing *dt;
        u32 val = 0;
        int ret = 0;