diff options
| author | Dave Airlie <airlied@gmail.com> | 2015-01-29 11:45:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2015-01-29 11:45:31 +1000 |
| commit | b3869b17fd63bacb53ac4db4ff4ba093701e17be (patch) | |
| tree | 073873d62957033f317bc413d9ea9fd5d5ff5a50 /drivers/char | |
| parent | 7b83741bf76caad72bc8a701c26dde8d6751ff0f (diff) | |
| parent | c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e (diff) | |
| download | lwn-b3869b17fd63bacb53ac4db4ff4ba093701e17be.tar.gz lwn-b3869b17fd63bacb53ac4db4ff4ba093701e17be.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
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
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions