tree 263ae0b69bfd53de3e5a6dd0983cc9eb31ccd1d2
parent aa72044a1d229ad8ad6fd53a2f2dd3da12430216
parent 5645e785cea2f33acdc5e5cee62b3ce8a00f1169
author Dave Airlie <airlied@redhat.com> 1450765177 +1000
committer Dave Airlie <airlied@redhat.com> 1450765177 +1000

Merge tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux into drm-next

I've decided to just send this fixes-for-next pull request now, even if
we don't have a patch for the CONFIG_PM_SLEEP build failure reviewed.
If you like my patch for that, I'd be happy to see it applied directly.

This pull request brings in little fixes from Dan Carpenter for the 3D
support added in this -next cycle.

* tag 'drm-vc4-next-2015-12-21' of http://github.com/anholt/linux:
  drm/vc4: fix an error code
  drm/vc4: allocate enough memory in vc4_save_hang_state()
  drm/vc4: copy_to_user() returns the number of bytes remaining