From: Dave Airlie <airlied@redhat.com>
Date: Thu, 27 Jun 2013 23:29:04 +0000 (+1000)
Subject: Merge branch 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux into drm... 
X-Git-Tag: v3.11-rc1~65^2~62
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=4a009085978de90db40f9f38bcfad501f86ca959;p=~andy%2Flinux

Merge branch 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux into drm-next

These changes are mostly minor fixes to things introduced in 3.10. The
biggest chunk is updates to the host1x firewall which checks job
submissions from userspace and wasn't working properly. All other
patches are mostly one-liners. Nothing new or too exciting this time
around.

* 'drm/for-next' of git://anongit.freedesktop.org/tegra/linux:
  gpu: host1x: Rework CPU syncpoint increment
  gpu: host1x: Fix client_managed type
  gpu: host1x: Fix memory access in syncpt request
  gpu: host1x: Copy gathers before verification
  gpu: host1x: Don't reset firewall between gathers
  gpu: host1x: Check reloc table before usage
  gpu: host1x: Check INCR opcode correctly
  drm/tegra: Remove DRIVER_BUS_PLATFORM from driver_features
  drm/tegra: Fix return value
  drm/tegra: Include header drm/drm.h
  MAINTAINERS: Update Tegra DRM entry
  drm/tegra: fix error return code in gr2d_submit()
  drm/tegra: fix missing unlock on error
  drm/tegra: Honor pixel-format changes
  drm/tegra: Explicitly set irq_enabled
  drm/tegra: Don't disable unused planes
---

4a009085978de90db40f9f38bcfad501f86ca959