From: Dave Airlie <airlied@redhat.com>
Date: Thu, 18 Jul 2013 10:04:50 +0000 (+1000)
Subject: Merge branch 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev into drm-fixes
X-Git-Tag: v3.11-rc2~17^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3668f0df6e62cd989909f40669bbe585e8dd51ae;p=linux.git

Merge branch 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev into drm-fixes

Fixes builds
* 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev:
  drm/rcar-du: Use the GEM PRIME helpers
  drm/shmobile: Use the GEM PRIME helpers
---

3668f0df6e62cd989909f40669bbe585e8dd51ae