diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:21:52 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-05-05 13:21:52 +0800 |
| commit | 0b3df30dcadcddc56aed56c3c2d2de2ca963e81d (patch) | |
| tree | 90512a52bb23bb6386714d3a8a0fb703626f0afb /drivers/staging/comedi/drivers/ni_tiocmd.c | |
| parent | fd9302c16fc244139c1ddfdffc145d5b772ed9ce (diff) | |
| parent | 54419e3efcd6677e4b0841666e2fc605d2e5df86 (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1
Conflicts:
include/linux/compiler-gcc.h
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_tiocmd.c')
0 files changed, 0 insertions, 0 deletions