tree 57ef361d05e6bbffe3ec490ca9110878a6e969e2
parent 4914c7f881845367b9198631a014ab466329b9e5
parent b19dd42faf413b4705d4adb38521e82d73fa4249
author Linus Torvalds <torvalds@linux-foundation.org> 1281747155 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281747155 -0700

Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  bkl: Remove locked .ioctl file operation
  v4l: Remove reference to bkl ioctl in compat ioctl handling
  logfs: kill BKL