diff options
author | Jonathan Cameron <jic23@kernel.org> | 2017-01-28 21:21:49 +0300 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2017-01-28 21:21:49 +0300 |
commit | 6db0f7ccc9f3876840e36c23ce357204cdc2d0ae (patch) | |
tree | 216ac355f5d7134a87acdc7678d308366250a303 /arch/nios2 | |
parent | 1dc2af87877dd43e6874ef331974505df63378e7 (diff) | |
parent | 93fbe91b552194af970256ce72934745d01df435 (diff) | |
download | linux-6db0f7ccc9f3876840e36c23ce357204cdc2d0ae.tar.xz |
Merge tag 'ib-mfd-iio-pwm-4.11' into test
Immutable branch between MFD, IIO and PWM due for the v4.11 merge window
Pulled into IIO to allow follow up series of triggered capture for the
STM32 ADCs.
Diffstat (limited to 'arch/nios2')
0 files changed, 0 insertions, 0 deletions