diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 09:20:47 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-12 09:20:47 +0300 |
commit | 7bf1e44f865523aa16e0eb340a82d643da9215b5 (patch) | |
tree | 1ddb344169d39413053057d888edbb18dfeed880 /fs/xfs/libxfs/xfs_rmap.c | |
parent | e5770b7bdbfe9f23bb75a7d5a88c1f5e18e20738 (diff) | |
parent | 32c1431eea4881a6b17bd7c639315010aeefa452 (diff) | |
download | linux-7bf1e44f865523aa16e0eb340a82d643da9215b5.tar.xz |
Merge 4.12-rc5 into staging-next
We want the IIO fixes and other staging driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/xfs/libxfs/xfs_rmap.c')
0 files changed, 0 insertions, 0 deletions