Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 20:58:28 +0000 (13:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Aug 2010 20:58:28 +0000 (13:58 -0700)
commit7233e392760b3493095d3d5885cb15e44493d74a
treee2095425fe34c635ee2cf77f9ef6022f7cddfbb1
parent4c619407b0439c59c20398b9459020c0d297f424
parent5ef06839f50c7e5e479d3595257131edf1f84f36
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