Merge branch 'staging-linus' into staging-next

This gets the 6 staging comedi patches that are needed for further
patches that Ian sent.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/comedi/drivers/amplc_dio200.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pc236.c
Simple merge

diff --cc drivers/staging/comedi/drivers/amplc_pc263.c
Simple merge