| commit | fcaca5d8d164bc5148b7e4f7d5daf9a1c956afae | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Jul 10 10:45:04 2018 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Jul 10 10:45:14 2018 +1000 |
| tree | 7eff3d2ba67966e0ce8673c3234f963b5573db28 | |
| parent | 1e4b044d22517cae7047c99038abb444423243ca [diff] | |
| parent | 2c83a726d6fbb5d130d8f2edd82a258adb675ac3 [diff] |
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes Lucas wrote: "a couple of small fixes: - 2 patches from Fabio to fix module reloading - one patch to fix a userspace visible regression, where the job timeout is a bit too eager and kills legitimate jobs" Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/1530868450.15725.8.camel@pengutronix.de