On Fri, Dec 06, 2013 at 02:11:30PM -0800, Ben Widawsky wrote:
> From: Ben Widawsky
>
> Signed-off-by: Ben Widawsky
>
> Conflicts:
> drivers/gpu/drm/i915/i915_debugfs.c
Please take these conflict markers out next time around ...
-Daniel
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 25 +
From: Ben Widawsky
Signed-off-by: Ben Widawsky
Conflicts:
drivers/gpu/drm/i915/i915_debugfs.c
---
drivers/gpu/drm/i915/i915_debugfs.c | 25 +
1 file changed, 25 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.
From: Ben Widawsky
Signed-off-by: Ben Widawsky
Conflicts:
drivers/gpu/drm/i915/i915_debugfs.c
---
drivers/gpu/drm/i915/i915_debugfs.c | 25 +
1 file changed, 25 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c
b/drivers/gpu/drm/i915/i915_debugfs.
