diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:38:44 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-30 06:38:44 -0400 |
| commit | bdc065666a591fddc4e55cbdcd6c7b02f289b5ff (patch) | |
| tree | acb92182d7c28a8d5176feb99fd7fb110a693ab7 /lib/test_hash.c | |
| parent | 32774ef3e4bb339cec19655946996a8c50063be4 (diff) | |
| parent | a909d3e636995ba7c349e2ca5dbb528154d4ac30 (diff) | |
| download | linux-stable-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.gz linux-stable-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.bz2 linux-stable-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.zip | |
Merge 4.9-rc3 into staging-next
This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/test_hash.c')
0 files changed, 0 insertions, 0 deletions