git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7b83741
c59c961
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author
Dave Airlie
<airlied@gmail.com>
Thu, 29 Jan 2015 01:45:31 +0000
(11:45 +1000)
committer
Dave Airlie
<airlied@gmail.com>
Thu, 29 Jan 2015 01:45:31 +0000
(11:45 +1000)
This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff