projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a37f2f8
8e934db
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Sun, 23 Jan 2011 17:24:26 +0000
(17:24 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 24 Jan 2011 23:45:32 +0000
(23:45 +0000)
Merge important suspend and resume regression fixes and resolve the
small conflict.
Conflicts:
drivers/gpu/drm/i915/i915_dma.c
1
2
drivers/gpu/drm/i915/i915_dma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem_execbuffer.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_irq.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_opregion.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_ringbuffer.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_ringbuffer.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_dma.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_irq.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_opregion.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_ringbuffer.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_ringbuffer.h
Simple merge