From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Aug 2010 20:58:28 +0000 (-0700)
Subject: Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7233e392760b3493095d3d5885cb15e44493d74a;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.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:
  staging: Pushdown bkl to easycap ioctl handlers
  autofs/autofs4: Move compat_ioctl handling into fs
  v4l: Convert v4l2-dev to unlocked_ioctl
  ia64/perfmon: Convert to unlocked_ioctl
  sunrpc: Remove duplicated #include
  ncpfs: Remove duplicated #include
---

7233e392760b3493095d3d5885cb15e44493d74a