]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ecc325b f674bd2)
Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux...
authorDave Airlie <airlied@redhat.com>
Mon, 13 Nov 2017 19:53:39 +0000 (05:53 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 13 Nov 2017 19:53:39 +0000 (05:53 +1000)
commitfc150d6bba8f446f77732cf27b09a7e646c25771
tree8673983d58196869d9063cd1ebedd1ead6dd4136tree
parentecc325bb76707370cfa6f34ef8574c7ee7577a23commit | diff
parentf674bd281460451e8784f3bc917a650e8937a8edcommit | 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
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c diff1 | diff2 | blob | history
drivers/gpu/drm/amd/include/amd_shared.h diff1 | diff2 | blob | history
Ubuntu Disco kernel mirror for Proxmox VE and PMG