Merge branch 'drm/3.11/fixes' of git://linuxtv.org/pinchartl/fbdev into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 18 Jul 2013 10:04:50 +0000 (20:04 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 18 Jul 2013 10:04:50 +0000 (20:04 +1000)
commit3668f0df6e62cd989909f40669bbe585e8dd51ae
tree83f1297534e2eff44f650845e8410d49cfcd8bd3
parentfb328d7365a1fc12166c90758ea6f3c2944539e0
parentffb40400762d86a34318160e8f2169b66f01473d
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