aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-23 14:51:50 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-11-23 14:51:50 -0800
commit7f6080975015b3feb1e086c5d328c7b28c228eb6 (patch)
tree52871a92bca207665a0258aa30c12e1dba546642 /drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c
parentstaging: rdma: ehca: Added a blank line (diff)
parentLinux 4.4-rc2 (diff)
downloadlinux-dev-7f6080975015b3feb1e086c5d328c7b28c228eb6.tar.xz
linux-dev-7f6080975015b3feb1e086c5d328c7b28c228eb6.zip
Merge 4.4-rc2 into staging-next
We want those fixes in here to resolve merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c')
0 files changed, 0 insertions, 0 deletions