tree d29ca8bc010a22f358032346d7e7b6887c455e08
parent d7f9729f6e06c9613a88a18c4e1fbbdf2f6146fd
parent e16a922a27ec352537a8027cadc32dc156534ca5
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1357600672 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1357600672 -0800

Merge branch 'staging-linus' into staging-next

This is to get the comedi fixes, and resolve the issue in comdi_test.c
and comedi_fops.c that were caused by changes in both branches.

It also allows the fwserial driver changes to be applied, as they
required the fixes that are in staging-linus.

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