]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 00:52:35 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Aug 2010 00:52:35 +0000 (17:52 -0700)
commit10041d2d14688e207d0d829095147aa82c1f211b
tree57ef361d05e6bbffe3ec490ca9110878a6e969e2
parent4914c7f881845367b9198631a014ab466329b9e5
parentb19dd42faf413b4705d4adb38521e82d73fa4249
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
include/linux/fs.h