tree 83f1297534e2eff44f650845e8410d49cfcd8bd3
parent fb328d7365a1fc12166c90758ea6f3c2944539e0
parent ffb40400762d86a34318160e8f2169b66f01473d
author Dave Airlie <airlied@redhat.com> 1374141890 +1000
committer Dave Airlie <airlied@redhat.com> 1374141890 +1000

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