]> err.no Git - linux-2.6/commitdiff
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:28:45 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Aug 2008 21:28:45 +0000 (14:28 -0700)
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: don't set the signal blocker on the master process.
  drm: don't call the vblank tasklet with irqs disabled.
  r300: Fix cliprect emit
  drm/radeon: r300_cmdbuf: Always emit INDX_BUFFER immediately after DRAW_INDEX
  radeon: fix some hard lockups on r3/4/500s


Trivial merge