Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next
authorDave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 12 Oct 2014 23:22:45 +0000 (10:22 +1100)
commit6889e783cd68b79f8330ad4d10a2571c67c3f7df
tree6ebb3900542a9d449e9c5d9b5191f35845f40130
parent75e58ce4c8f354f1a68a8bb8a9692827cdaf3d21
parenta8b1ee8bafc765ebf029d03c5479a69aebff9693
Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next
fs/xfs/xfs_aops.c
fs/xfs/xfs_bmap_util.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_ioctl.c