From: Dave Airlie Date: Fri, 20 Jul 2012 01:20:54 +0000 (-0400) Subject: Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b68bdc1bbab743e2911b40c27b91a0a8e641cfb7;p=linux-beck.git Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-next This contains all the radeon documentation rebased on top of the ib fixes. * 'next' of git://people.freedesktop.org/~deathsimple/linux: drm/radeon: fix SS setup for DCPLL drm/radeon: fix up pll selection on DCE5/6 drm/radeon: start to document evergreen.c drm/radeon: start to document the functions r100.c drm/radeon: document VM functions in radeon_gart.c (v3) drm/radeon: document non-VM functions in radeon_gart.c (v2) drm/radeon: document radeon_ring.c (v4) drm/radeon: document radeon_fence.c (v2) drm/radeon: document radeon_asic.c drm/radeon: document radeon_irq_kms.c drm/radeon: document radeon_kms.c drm/radeon: document radeon_device.c (v2) drm/radeon: add rptr save support for r1xx-r5xx drm/radeon: update rptr saving logic for memory buffers drm/radeon: remove radeon_ring_index() drm/radeon: update ib_execute for SI (v2) drm/radeon: fix const IB handling v2 drm/radeon: let sa manager block for fences to wait for v2 drm/radeon: return an error if there is nothing to wait for --- b68bdc1bbab743e2911b40c27b91a0a8e641cfb7