| commit | 17cb3be61b45d716f6b21a9380925493413ce0ed | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jan 07 15:17:52 2013 -0800 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Jan 07 15:17:52 2013 -0800 |
| tree | d29ca8bc010a22f358032346d7e7b6887c455e08 | |
| parent | d7f9729f6e06c9613a88a18c4e1fbbdf2f6146fd [diff] | |
| parent | e16a922a27ec352537a8027cadc32dc156534ca5 [diff] |
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>