diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:49:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:49:24 +0200 |
| commit | b397f82585c3101dcf92642dd359891e66d00c55 (patch) | |
| tree | 5f7f711b8582d723e1f4c0bb658b7dcaba656ad4 /drivers/iio/trigger | |
| parent | b60080197af4a78ef0563c90cfca1074034def55 (diff) | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
| download | linux-b397f82585c3101dcf92642dd359891e66d00c55.tar.bz2 | |
Merge 5.1-rc3 into staging-next
We want those fixes and this resolves an erofs merge conflict.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/trigger')
0 files changed, 0 insertions, 0 deletions