tree 26aa1761693f7fb83e83acc6a68e2b85a968c3e0
parent 4ef7fe7c66d4653930f67566a1df1c8f2d6daa6b
parent 36ff39c4045ee71cd306f8af5f8c2a1c6e998eba
author Dave Airlie <airlied@redhat.com> 1340276303 +0100
committer Dave Airlie <airlied@redhat.com> 1340276303 +0100

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