Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:23:28 +0000 (17:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:23:28 +0000 (17:23 -0700)
commit98c89cdd3a292af3451e47a2a33132f5183861b0
treecfad77bcfd2d04fb0b9326a859803a1ab90b0757
parent164d44fd92e79d5bce54d0d62df9f856f7b23925
parent99df95a22f7cfcf85405d4edc07c2d953542f0dd
Merge branch 'bkl/procfs' of git://git./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
drivers/isdn/divert/divert_procfs.c
fs/proc/base.c
fs/proc/inode.c
fs/proc/kcore.c
fs/proc/vmcore.c