git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c759606
19583ca
)
Merge tag 'v3.16' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Mon, 4 Aug 2014 23:04:59 +0000
(09:04 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 4 Aug 2014 23:04:59 +0000
(09:04 +1000)
Linux 3.16
backmerge requested by i915, nouveau and radeon authors
Conflicts:
drivers/gpu/drm/i915/i915_gem_render_state.c
drivers/gpu/drm/i915/intel_drv.h
Trivial merge