diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-07-30 02:39:22 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-30 02:39:22 +0200 |
| commit | 3fce4618279373efc59a91adb16c11da46cd69e5 (patch) | |
| tree | 086fad6c9f260a0bcc9b6a3532c6cddc387dd907 /drivers/gpu/drm/vc4/vc4_debugfs.c | |
| parent | Merge tag 'drm-amdkfd-next-2018-07-28' of git://people.freedesktop.org/~gabba... (diff) | |
| parent | Linux 4.18-rc7 (diff) | |
| download | linux-3fce4618279373efc59a91adb16c11da46cd69e5.tar.xz linux-3fce4618279373efc59a91adb16c11da46cd69e5.zip | |
BackMerge v4.18-rc7 into drm-next
rmk requested this for armada and I think we've had a few
conflicts build up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vc4/vc4_debugfs.c')
0 files changed, 0 insertions, 0 deletions