]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl...
authorDave Airlie <airlied@redhat.com>
Thu, 20 Aug 2015 04:11:17 +0000 (14:11 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Aug 2015 04:11:17 +0000 (14:11 +1000)
Merge Freescale DCU FRM driver.

* 'drm-next-fsl-dcu' of https://github.com/Jianwei-Wang/linux-drm-fsl-dcu:
  MAINTAINERS: Add Freescale DCU DRM driver maintainer
  devicetree: Add NEC to the vendor-prefix list
  drm/layerscape: Add Freescale DCU DRM driver

1  2 
drivers/gpu/drm/Kconfig

Simple merge