Merge tag 'drm/for-3.14-rc3' of git://anongit.freedesktop.org/tegra/linux into drm...
authorDave Airlie <airlied@redhat.com>
Thu, 20 Feb 2014 06:22:25 +0000 (16:22 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 20 Feb 2014 06:22:25 +0000 (16:22 +1000)
commit5d7aad03c80f568dc8515f349956ae6644f3bf8f
tree70b509145cd3a4f77d919ae55815c5105fdec768
parent75936c65dda54a08d9124f24f8725f86a4adc286
parentb18915379071b31ea819a36ca67761620decba06
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'