git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
91d9f98
e260818
)
Backmerge v4.1-rc4 into into drm-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 20 May 2015 06:23:53 +0000
(16:23 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 20 May 2015 06:23:53 +0000
(16:23 +1000)
We picked up a silent conflict in amdkfd with drm-fixes and drm-next,
backmerge v4.1-rc5 and fix the conflicts
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/drm_irq.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff