From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 May 2010 00:23:28 +0000 (-0700)
Subject: Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=98c89cdd3a292af3451e47a2a33132f5183861b0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

98c89cdd3a292af3451e47a2a33132f5183861b0