diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-29 04:57:29 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-29 04:57:29 +0100 |
commit | 7e59fad9c9d1aeacdc96dfffd35f9e12ddc34dbf (patch) | |
tree | 777a6c0f905f540990123cdb4dff261d63d582f5 /drivers/gpio/gpio-mvebu.c | |
parent | Merge tag 'hwmon-for-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
parent | Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into ... (diff) | |
download | linux-7e59fad9c9d1aeacdc96dfffd35f9e12ddc34dbf.tar.xz linux-7e59fad9c9d1aeacdc96dfffd35f9e12ddc34dbf.zip |
Merge tag 'drm-next-2018-12-27' of git://anongit.freedesktop.org/drm/drm
Pull more drm updates from Dave Airlie:
"Daniel collected a couple of pulls after I want on holidays, back for
a couple of days, so may as well send them out.
This has exynos and etnaviv work for 4.21.
exynos:
- plane alpha and blending configurability
etnaviv:
- mostly cleanups in prep for new features"
* tag 'drm-next-2018-12-27' of git://anongit.freedesktop.org/drm/drm:
drm/etnaviv: remove lastctx member from gpu struct
drm/etnaviv: replace header include with forward declaration
drm/etnaviv: remove unnecessary local irq disable
drm/exynos: fimd: Make pixel blend mode configurable
drm/exynos: fimd: Make plane alpha configurable
drm/etnaviv: Replace drm_dev_unref with drm_dev_put
drm/etnaviv: consolidate hardware fence handling in etnaviv_gpu
drm/etnaviv: kill active fence tracking
Diffstat (limited to 'drivers/gpio/gpio-mvebu.c')
0 files changed, 0 insertions, 0 deletions