projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e4b044 2c83a72)
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 00:45:04 +0000 (10:45 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 10 Jul 2018 00:45:14 +0000 (10:45 +1000)
commitfcaca5d8d164bc5148b7e4f7d5daf9a1c956afae
tree7eff3d2ba67966e0ce8673c3234f963b5573db28tree | snapshot
parent1e4b044d22517cae7047c99038abb444423243cacommit | diff
parent2c83a726d6fbb5d130d8f2edd82a258adb675ac3commit | 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
ep93xx device tree rework repo: git://git.maquefel.me/linux.git