summary refs log tree commit diff
path: root/crypto/af_alg.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 19:57:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-12-28 19:57:29 -0800
commit7e59fad9c9d1aeacdc96dfffd35f9e12ddc34dbf (patch)
tree777a6c0f905f540990123cdb4dff261d63d582f5 /crypto/af_alg.c
parent8754040378e4ff70b3bb96b1dabac62da5dfb870 (diff)
parent221b35fedee1b38b9cee99320f0c60263d229e14 (diff)
downloadlinux-7e59fad9c9d1aeacdc96dfffd35f9e12ddc34dbf.tar.gz
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 'crypto/af_alg.c')
0 files changed, 0 insertions, 0 deletions