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 /include/linux/timerqueue.h | |
| parent | staging: comedi: comedi_test: convert attach message to dev_info (diff) | |
| parent | staging: comedi: das08: Fix PCI ref count (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 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions