Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:42:48 +0000 (08:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Apr 2009 15:42:48 +0000 (08:42 -0700)
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  agp: zero pages before sending to userspace
  drm: check for minor master before allowing drop master.
  drm: set/clear is_master when master changed
  drm: clean dirty memory after device release
  drm: count reaches -1


Trivial merge