summaryrefslogtreecommitdiffstats
path: root/drivers/block/pktcdvd.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 02:23:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-20 02:23:28 +0200
commit98c89cdd3a292af3451e47a2a33132f5183861b0 (patch)
treecfad77bcfd2d04fb0b9326a859803a1ab90b0757 /drivers/block/pktcdvd.c
parentMerge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentsunrpc: Include missing smp_lock.h (diff)
downloadlinux-98c89cdd3a292af3451e47a2a33132f5183861b0.tar.xz
linux-98c89cdd3a292af3451e47a2a33132f5183861b0.zip
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: sunrpc: Include missing smp_lock.h procfs: Kill the bkl in ioctl procfs: Push down the bkl from ioctl procfs: Use generic_file_llseek in /proc/vmcore procfs: Use generic_file_llseek in /proc/kmsg procfs: Use generic_file_llseek in /proc/kcore procfs: Kill BKL in llseek on proc base
Diffstat (limited to 'drivers/block/pktcdvd.c')
0 files changed, 0 insertions, 0 deletions