]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'drm-intel/for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
commite9db9fc8503e71057a7c0e2e06ca2cfcdf92957a
tree790060689a7a8bf7c1d4bda68ae40a102bde4b3a
parente4d216560ea2f5ec0cb0b079863759017717c5b6
parentf10fe8f89d85ab170ec4491cd15ba7410a03a4c8
Merge remote-tracking branch 'drm-intel/for-linux-next'

# Conflicts:
# drivers/gpu/drm/i915/display/vlv_dsi.c
drivers/gpu/drm/i915/display/skl_universal_plane.c