Merge branch 'samsung/dt' into samsung/cleanup

Conflicts:
	arch/arm/mach-s3c64xx/Makefile
	arch/arm/mach-s5pc100/Makefile
	arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index c681dc149d2a..b9da8900ae4e 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -756,9 +756,9 @@ intel_enable_semaphores(struct drm_device *dev)
         if (i915_semaphores >= 0)
                 return i915_semaphores;
 
-        /* Enable semaphores on SNB when IO remapping is off */
+        /* Disable semaphores on SNB */
         if (INTEL_INFO(dev)->gen == 6)
-                return !intel_iommu_enabled;
+                return 0;
 
         return 1;
 }