commit de19322d554fd0f449d17610823c38494c06db9e
author Dave Airlie <airlied@redhat.com> Thu Feb 25 13:39:29 2010 +1000
committer Dave Airlie <airlied@redhat.com> Thu Feb 25 13:39:29 2010 +1000
tree df91899c274005adb02a7a8ca5d9e5609bc2d05b
parent 60b341b778cc2929df16c0a504c91621b3c6a4ad
parent 290e55056ec3d25c72088628245d8cae037b30db

Merge remote branch 'korg/drm-core-next' into drm-next-stage

* korg/drm-core-next:
  drm/ttm: handle OOM in ttm_tt_swapout
  drm/radeon/kms/atom: fix shr/shl ops
  drm/kms: fix spelling of "CLOCK"
  drm/kms: fix fb_changed = true else statement
  drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
  drm: switch all GEM/KMS ioctls to unlocked ioctl status.
  Use drm_gem_object_[handle_]unreference_unlocked where possible
  drm: introduce drm_gem_object_[handle_]unreference_unlocked