From: Linus Torvalds Date: Sat, 14 Aug 2010 00:52:35 +0000 (-0700) Subject: Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... X-Git-Tag: MMI-PSA29.97-13-9~22552 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10041d2d14688e207d0d829095147aa82c1f211b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'bkl/ioctl' of git://git./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 --- 10041d2d14688e207d0d829095147aa82c1f211b