Merge tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:13:08 +0000 (16:13 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 5 Apr 2014 06:13:08 +0000 (16:13 +1000)
commit82c68b6ccd54117a87cb2d9b91c2ee6e1280cf9d
treef7835f0e4a1884253cbd46bfdb7cbc4fa920b6cc
parent243b930f8b228428c2a14ebbb09045041ed0bc70
parentd105a6c97e43e35fd4f852928bb8a19df235c6e7
Merge tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Changes for v3.15-rc1

Implement eDP support for Tegra124 and support the PRIME vmap()/vunmap()
operations.

A symbol that is required for upcoming V4L2 support is now exported by
the host1x driver.

Relicense drivers under the GPL v2 for consistency. One exception is the
public header file, which is relicensed under MIT to abide by the common
rule.

* tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Use standard GPL v2 license text
  drm/tegra: Relicense under GPL v2
  drm/tegra: Relicense public header under MIT
  drm/tegra: Add eDP support
  gpu: host1x: export host1x_syncpt_incr_max() function
  drm/tegra: prime: Add vmap support
drivers/gpu/drm/tegra/drm.c