commit 092e0e7e520a1fca03e13c9f2d157432a8657ff2
author Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 22 10:52:56 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Oct 22 10:52:56 2010 -0700
tree 451897252c4c08c4b5a8ef535da156f1e817e80b
parent 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800
parent 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  vfs: make no_llseek the default
  vfs: don't use BKL in default_llseek
  llseek: automatically add .llseek fop
  libfs: use generic_file_llseek for simple_attr
  mac80211: disallow seeks in minstrel debug code
  lirc: make chardev nonseekable
  viotape: use noop_llseek
  raw: use explicit llseek file operations
  ibmasmfs: use generic_file_llseek
  spufs: use llseek in all file operations
  arm/omap: use generic_file_llseek in iommu_debug
  lkdtm: use generic_file_llseek in debugfs
  net/wireless: use generic_file_llseek in debugfs
  drm: use noop_llseek