commit f9143eae1035195352da7577d89ec5982cbc9f72
author Linus Torvalds <torvalds@linux-foundation.org> Fri Dec 02 13:30:25 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Dec 02 13:30:25 2011 -0800
tree 4f08a89256cdd4944cd68431fbeb4aabda525a1f
parent ffb8fb5469315755ec2dd462452dcb869b358d55
parent dfd8ee92a9192d78aa38cf8699df3630a7c88c85

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  Staging: comedi: fix integer overflow in do_insnlist_ioctl()
  Revert "Staging: comedi: integer overflow in do_insnlist_ioctl()"
  Staging: comedi: integer overflow in do_insnlist_ioctl()
  Staging: comedi: fix signal handling in read and write
  Staging: comedi: fix mmap_count
  staging: comedi: fix oops for USB DAQ devices.
  staging: comedi: usbduxsigma: Fixed wrong range for the analogue channel.
  staging:rts_pstor:Complete scanning_done variable
  staging: usbip: bugfix for deadlock