Back-merge tag 'v4.7-rc5' into drm-next

Linux 4.7-rc5 The fsl-dcu pull needs -rc3 so go to -rc5 for now.
2016-07-02 15:56:01 +10:00
parent 583fa4e027 4c2e07c6a2
commit 542d972221
751 changed files with 6929 additions and 4314 deletions
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1167,7 +1167,6 @@ static int dsi_regulator_init(struct platform_device *dsidev)
 {
 	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
 	struct regulator *vdds_dsi;
-	int r;

 	if (dsi->vdds_dsi_reg != NULL)
 		return 0;