]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:27:01 +0000 (14:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 30 Mar 2008 21:27:01 +0000 (14:27 -0700)
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: fix for non-coherent DMA PowerPC
  drm: radeon: fix sparse integer as NULL pointer warnings in radeon_mem.c
  drm/i915: fix oops on agp=off
  drm/r300: fix bug in r300 userspace hardware wait emission


Trivial merge