tree cfad77bcfd2d04fb0b9326a859803a1ab90b0757
parent 164d44fd92e79d5bce54d0d62df9f856f7b23925
parent 99df95a22f7cfcf85405d4edc07c2d953542f0dd
author Linus Torvalds <torvalds@linux-foundation.org> 1274315008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1274315008 -0700

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