| commit | fc150d6bba8f446f77732cf27b09a7e646c25771 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Nov 14 05:53:39 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Nov 14 05:53:39 2017 +1000 |
| tree | 8673983d58196869d9063cd1ebedd1ead6dd4136 | |
| parent | ecc325bb76707370cfa6f34ef8574c7ee7577a23 [diff] | |
| parent | f674bd281460451e8784f3bc917a650e8937a8ed [diff] |
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