| commit | 5805977e63a36ad56594a623f3bd2bebcb7db233 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 20 16:40:24 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 20 16:40:24 2009 -0700 |
| tree | 8853fa72c4b5a8e27a03782bca0a7d2d5b3f89f4 | |
| parent | a9523f45264aee8ec8d9f82091a0dfe1418fb2f8 [diff] | |
| parent | 9b6fe313bfce27d4a261257da70196be0ac2bef5 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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