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)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge