Merge remote branch 'korg/drm-core-next' into drm-next-stage
authorDave Airlie <airlied@redhat.com>
Thu, 25 Feb 2010 03:39:29 +0000 (13:39 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 25 Feb 2010 03:39:29 +0000 (13:39 +1000)
* 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


Trivial merge