diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:58:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 11:58:26 -0700 |
| commit | c283cf384a7debe3fa421c4f77a375e111e8fcb5 (patch) | |
| tree | 62fdb0bd65d11ee4820db5c2ebad17fd0984b4bb /include/linux/timerqueue.h | |
| parent | staging: comedi: serial2002: Set range for digital inputs and outputs (diff) | |
| parent | staging: comedi: das08: Correct AO output for das08jr-16-ao (diff) | |
Merge branch 'staging-linus' into staging-next
Pick up 2 more comedi patches from Ian that are needed for other
changes in the future.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions