diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 15:26:48 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-28 15:26:48 +0200 |
commit | 8439a69e72888daa7d2667980efaf20d8bbe7b20 (patch) | |
tree | ff262847ff4f6797c9df882379ea0498a8822a18 /drivers/spi/spi-test.h | |
parent | b9920ca3b53728aaa836f138f74ebb37776b9f57 (diff) | |
parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) |
Merge 4.13-rc7 into staging-next
We want the staging and iio fixes in here to handle the merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spi/spi-test.h')
0 files changed, 0 insertions, 0 deletions