From: Dave Airlie <airlied@redhat.com>
Date: Thu, 20 Feb 2014 06:22:25 +0000 (+1000)
Subject: Merge tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux into drm... 
X-Git-Tag: firefly_0821_release~176^2~4337^2~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5d7aad03c80f568dc8515f349956ae6644f3bf8f;p=firefly-linux-kernel-4.4.55.git

Merge tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux into drm-fixes

drm/tegra: Fixes for v3.14-rc3

These patches contain a fix for a potential hang when the RGB output is
disabled twice, a typofix that prevents the framebuffer console from
being restored on ->lastclose() and an optimization to do as little work
as possible during host1x job submission.

* tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Add guard to avoid double disable/enable of RGB outputs
  gpu: host1x: do not check previously handled gathers
  drm/tegra: fix typo 'CONFIG_TEGRA_DRM_FBDEV'
---

5d7aad03c80f568dc8515f349956ae6644f3bf8f