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

* 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  uml: Pushdown the bkl from harddog_kern ioctl
  sunrpc: Pushdown the bkl from sunrpc cache ioctl
  sunrpc: Pushdown the bkl from ioctl
  autofs4: Pushdown the bkl from ioctl
  uml: Convert to unlocked_ioctls to remove implicit BKL
  ncpfs: BKL ioctl pushdown
  coda: Clean-up whitespace problems in pioctl.c
  coda: BKL ioctl pushdown
  drivers: Push down BKL into various drivers
  isdn: Push down BKL into ioctl functions
  scsi: Push down BKL into ioctl functions
  dvb: Push down BKL into ioctl functions
  smbfs: Push down BKL into ioctl function
  coda/psdev: Remove BKL from ioctl function
  um/mmapper: Remove BKL usage
  sn_hwperf: Kill BKL usage
  hfsplus: Push down BKL into ioctl function

diff --cc arch/ia64/sn/kernel/sn2/sn_hwperf.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dvb_frontend.c
Simple merge

diff --cc drivers/media/dvb/dvb-core/dvb_net.c
Simple merge

diff --cc drivers/mtd/mtdchar.c
Simple merge

diff --cc drivers/pcmcia/pcmcia_ioctl.c
Simple merge

diff --cc drivers/scsi/3w-9xxx.c
Simple merge

diff --cc drivers/scsi/3w-sas.c
Simple merge

diff --cc drivers/scsi/3w-xxxx.c
Simple merge

diff --cc drivers/scsi/gdth.c
Simple merge

diff --cc drivers/usb/mon/mon_bin.c
Simple merge

diff --cc net/sunrpc/cache.c
Simple merge