Merge tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 12 May 2016 01:15:18 +0000 (11:15 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 12 May 2016 01:15:18 +0000 (11:15 +1000)
commitabaae3ec8074325f1583903a439ff98ad5833c20
treea310067485cfd22f93eccb8ba00715b8907b138e
parent0c673e3fcd4d36b48bb4b62f04ec650ec2edce99
parentb504fc56481fe78d7eb09872b71bcd8745e9d736
Merge tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v4.7-rc1

Two small changes, one getting rid of the bogus gamma table size and
another removing Terje from the MAINTAINERS file since he no longer does
any work on host1x or display.

* tag 'drm/tegra/for-4.7-rc1' of git://anongit.freedesktop.org/tegra/linux:
  MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer
  drm/tegra: Don't set a gamma table size
MAINTAINERS