]> git.openpandora.org Git - pandora-kernel.git/commitdiff
drm/i915: add ccid to error state
authorBen Widawsky <ben@bwidawsk.net>
Mon, 4 Jun 2012 21:42:52 +0000 (14:42 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 14 Jun 2012 15:36:19 +0000 (17:36 +0200)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c

Simple merge
Simple merge
Simple merge