projects
/
platform
/
kernel
/
linux-arm64.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df15315
1bb9583
)
Merge branch 'drm-intel-fixes' into drm-intel-next
author
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000
(06:49 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:49:30 +0000
(06:49 +0000)
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
1
2
drivers/gpu/drm/i915/i915_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_i2c.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_i2c.c
Simple merge