git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8dd0eb3
9eccca0
)
Merge tag 'v4.0-rc3' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Mon, 9 Mar 2015 09:58:30 +0000
(19:58 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Mon, 9 Mar 2015 09:58:30 +0000
(19:58 +1000)
Linux 4.0-rc3 backmerge to fix two i915 conflicts, and get
some mainline bug fixes needed for my testing box
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff