aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds2009-05-20 16:40:24 -0700
committerLinus Torvalds2009-05-20 16:40:24 -0700
commit5805977e63a36ad56594a623f3bd2bebcb7db233 (patch)
tree8853fa72c4b5a8e27a03782bca0a7d2d5b3f89f4 /arch
parenta9523f45264aee8ec8d9f82091a0dfe1418fb2f8 (diff)
parent9b6fe313bfce27d4a261257da70196be0ac2bef5 (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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions