Merge branch 'xfs-O_TMPFILE-support' into for-next
authorDave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:14:43 +0000 (19:14 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 13 Mar 2014 08:14:43 +0000 (19:14 +1100)
commitfe986f9d88ab8079c91669b7f175081f15491a80
tree73be54e2c5378750dee0ebc0720af5143d2c4dc6
parent5f44e4c185ec5a4a438841cbd4983d0c4a106a4a
parentab29743117f9f4c22ac44c13c1647fb24fb2bafe
Merge branch 'xfs-O_TMPFILE-support' into for-next

Conflicts:
fs/xfs/xfs_trans_resv.c
- fix for XFS_INODE_CLUSTER_SIZE macro removal
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_iops.c
fs/xfs/xfs_symlink.c
fs/xfs/xfs_trans_resv.c
fs/xfs/xfs_trans_resv.h