diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 16:01:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 16:01:20 -0700 |
| commit | b600c5b569c2f62eacf8d71dd9975d7a996073f3 (patch) | |
| tree | 4b16b0ada1c7a732fc04518ecdd2d6c97512729f /include/linux | |
| parent | staging: comedi: s626: fix the number of dio channels (diff) | |
| parent | staging:iio: Add some missing peak elements to the info_mask (diff) | |
Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions