git.monstr.eu Git - linux-2.6-microblaze.git/commit

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

author	Dave Airlie <airlied@redhat.com>
	Mon, 1 Mar 2010 05:40:12 +0000 (15:40 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Mon, 1 Mar 2010 05:40:12 +0000 (15:40 +1000)
commit	79fa9eb7396238233c327668185d28bb47fb0796
tree	df91899c274005adb02a7a8ca5d9e5609bc2d05b	tree
parent	60b341b778cc2929df16c0a504c91621b3c6a4ad	commit \| diff
parent	290e55056ec3d25c72088628245d8cae037b30db	commit \| diff

drivers/gpu/drm/i915/i915_gem.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/atom.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_tt.c	diff1 \|	diff2 \|	blob \| history