tree b77411ace423d8702da51938c953914d341fba80
parent a1c36e52068a59374e127d60e4d8f4377072fc98
parent 637e8a60a7aaf4ef7d46cfdf83bcfac9cf6f0fbd
author Linus Torvalds <torvalds@linux-foundation.org> 1260593866 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260593866 -0800

Merge branch 'compat-ioctl-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

* 'compat-ioctl-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
  usbdevfs: move compat_ioctl handling to devio.c
  lp: move compat_ioctl handling into lp.c
  compat_ioctl: pass compat pointer directly to handlers
  compat_ioctl: simplify lookup table
  compat_ioctl: simplify calling of handlers
  compat_ioctl: inline all conversion handlers
  compat_ioctl: Remove BKL
  compat_ioctl: remove all VT ioctl handling