Merge tag 'v4.6-rc7' into drm-next

Merge this back as we've built up a fair few conflicts, and I have some newer trees to pull in.
2016-05-09 13:49:56 +10:00
parent ba391646d0 44549e8f5e
commit bafb86f5bc
715 changed files with 7263 additions and 3929 deletions
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -924,7 +924,6 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable)
 	struct fimd_context *ctx = container_of(clk, struct fimd_context,
 						dp_clk);
 	u32 val = enable ? DP_MIE_CLK_DP_ENABLE : DP_MIE_CLK_DISABLE;
-
 	writel(val, ctx->regs + DP_MIE_CLKCON);
 }