OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc7096f
206c5f6
)
Merge tag 'v3.18-rc4' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 12 Nov 2014 00:29:34 +0000
(10:29 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 12 Nov 2014 07:53:30 +0000
(17:53 +1000)
backmerge to get vmwgfx locking changes into next as the
conflict with per-plane locking.
1
2
drivers/gpu/drm/armada/armada_crtc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/armada/armada_crtc.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp.c
Simple merge