Merge branch 'xfs-feature-bit-cleanup' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 19 May 2014 22:57:02 +0000 (08:57 +1000)
committerDave Chinner <david@fromorbit.com>
Mon, 19 May 2014 22:57:02 +0000 (08:57 +1000)
Conflicts:
fs/xfs/xfs_inode.c


Trivial merge