Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
Linus Torvalds [Thu, 20 May 2010 00:23:28 +0000 (17:23 -0700)]
* '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

1  2 
drivers/isdn/divert/divert_procfs.c
fs/proc/base.c
fs/proc/inode.c
fs/proc/kcore.c
fs/proc/vmcore.c

Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc fs/proc/inode.c
Simple merge
diff --cc fs/proc/kcore.c
Simple merge
Simple merge