git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9523f4 9b6fe31)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 23:40:24 +0000 (16:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 May 2009 23:40:24 +0000 (16:40 -0700)
* '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


Trivial merge
Pandora Kernel Repository