summaryrefslogtreecommitdiff
path: root/fs/xfs/libxfs/xfs_rmap.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-12 09:20:47 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-12 09:20:47 +0300
commit7bf1e44f865523aa16e0eb340a82d643da9215b5 (patch)
tree1ddb344169d39413053057d888edbb18dfeed880 /fs/xfs/libxfs/xfs_rmap.c
parente5770b7bdbfe9f23bb75a7d5a88c1f5e18e20738 (diff)
parent32c1431eea4881a6b17bd7c639315010aeefa452 (diff)
downloadlinux-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