diff options
author | Dave Airlie <airlied@redhat.com> | 2017-11-13 20:53:39 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-11-13 20:53:39 +0100 |
commit | fc150d6bba8f446f77732cf27b09a7e646c25771 (patch) | |
tree | 8673983d58196869d9063cd1ebedd1ead6dd4136 /drivers/gpu/drm/i2c | |
parent | Merge tag 'drm-misc-fixes-2017-11-13' of git://anongit.freedesktop.org/drm/dr... (diff) | |
parent | drm/amdgpu Moving amdgpu asic types to a separate file (diff) | |
download | linux-fc150d6bba8f446f77732cf27b09a7e646c25771.tar.xz linux-fc150d6bba8f446f77732cf27b09a7e646c25771.zip |
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into drm-next
This is a shared tree between drm and audio for some amd bits.
* 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu Moving amdgpu asic types to a separate file
ASoC: AMD: Added asic_type as ACP DMA driver platform data
drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data
Diffstat (limited to 'drivers/gpu/drm/i2c')
0 files changed, 0 insertions, 0 deletions