| commit | 3fce4618279373efc59a91adb16c11da46cd69e5 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Mon Jul 30 10:39:22 2018 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Mon Jul 30 10:39:22 2018 +1000 |
| tree | 086fad6c9f260a0bcc9b6a3532c6cddc387dd907 | |
| parent | ecd7963f7cf967009882fd56eaee1e87a229bea2 [diff] | |
| parent | acb1872577b346bd15ab3a3f8dff780d6cca4b70 [diff] |
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>