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)
commit95306975e9dd38ba2775dd96cb29987ecc7d9360
treea310067485cfd22f93eccb8ba00715b8907b138e
parent93f517c4a76ffba270c42c9bf0bc32801572c077
parent057eab2013ecbba2e772293acc177e2e3210f05d
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