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:
69f627f
cc7096f
)
Merge remote-tracking branch 'airlied/drm-next' into HEAD
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Nov 2014 09:55:35 +0000
(10:55 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Nov 2014 09:55:35 +0000
(10:55 +0100)
Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1
2
Documentation/DocBook/drm.tmpl
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/drm_plane_helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_cmd_parser.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_reg.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_lrc.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/DocBook/drm.tmpl
Simple merge
diff --cc
drivers/gpu/drm/drm_plane_helper.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_cmd_parser.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_reg.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_lrc.c
Simple merge