diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:46:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:46:38 -0700 |
| commit | 4d480efacee65eba9b6301dd02d679458d5ce447 (patch) | |
| tree | 5876cd6337e254266b4276ee46fd664abb6b38d1 /drivers/staging/comedi/drivers/serial2002.c | |
| parent | 9ac6eb40510bf9e6e82435f78f5c1cb92ee3f97a (diff) | |
| parent | 4a7a4f95a5e15648f24a971b36b82adc36d2cb6b (diff) | |
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/serial2002.c')
0 files changed, 0 insertions, 0 deletions