summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-21 01:40:24 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-21 01:40:24 +0200
commit5805977e63a36ad56594a623f3bd2bebcb7db233 (patch)
tree8853fa72c4b5a8e27a03782bca0a7d2d5b3f89f4 /kernel/trace/trace.c
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentdrm: Copy back ioctl data to userspace regardless of return code. (diff)
downloadlinux-5805977e63a36ad56594a623f3bd2bebcb7db233.tar.xz
linux-5805977e63a36ad56594a623f3bd2bebcb7db233.zip
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 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions