Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-core...
authorDave Airlie <airlied@redhat.com>
Thu, 21 Jun 2012 10:58:23 +0000 (11:58 +0100)
committerDave Airlie <airlied@redhat.com>
Thu, 21 Jun 2012 10:58:23 +0000 (11:58 +0100)
commit7c0143341a5b457eecf2490ab823a19e98ec082f
tree26aa1761693f7fb83e83acc6a68e2b85a968c3e0
parent4ef7fe7c66d4653930f67566a1df1c8f2d6daa6b
parent36ff39c4045ee71cd306f8af5f8c2a1c6e998eba
Merge branch 'next' of git://people.freedesktop.org/~deathsimple/linux into drm-core-next

* 'next' of git://people.freedesktop.org/~deathsimple/linux:
  drm/radeon: replace cs_mutex with vm_mutex v3
  drm/radeon: replace pflip and sw_int counters with atomics
  drm/radeon: apply Murphy's law to the kms irq code v3
  drm/radeon: fix & improve ih ring handling v3
  drm/radeon: remove some unneeded structure members
  drm/radeon: replace vmram_mutex with mclk_lock v2
  drm/radeon: rework ring syncing code
  drm/radeon: add infrastructure for advanced ring synchronization v2
  drm/radeon: remove radeon_fence_create