From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 May 2009 23:40:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5805977e63a36ad56594a623f3bd2bebcb7db233;p=deliverable%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/drm-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6:
  drm: Copy back ioctl data to userspace regardless of return code.
  drm: Round size of SHM maps to PAGE_SIZE
---

5805977e63a36ad56594a623f3bd2bebcb7db233