summaryrefslogtreecommitdiffstats
path: root/include/linux/falloc.h
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-03-25 14:29:13 +1100
committerDave Chinner <david@fromorbit.com>2015-03-25 14:29:13 +1100
commitd41bb03444147305e955cdd53753f0493e4d9e28 (patch)
tree37535eb32e725933b0c24df5c52c123b187fa910 /include/linux/falloc.h
parent88e8fda99a4c99a1a6482510655dbd88cccd221b (diff)
parent7dcf5c3e4527cfa2807567b00387cf2ed5e07f00 (diff)
downloadlinux-d41bb03444147305e955cdd53753f0493e4d9e28.tar.gz
linux-d41bb03444147305e955cdd53753f0493e4d9e28.tar.bz2
linux-d41bb03444147305e955cdd53753f0493e4d9e28.zip
Merge branch 'xfs-rename-whiteout' into for-next
Conflicts: fs/xfs/xfs_inode.c
Diffstat (limited to 'include/linux/falloc.h')
0 files changed, 0 insertions, 0 deletions