tree cccbdd2422a7338a8185eb83493ffac3bb4ddaa9
parent 0d907a3bb4a77cffebebd17c323e898048301aa3
parent ab3e57b53f549ad51cbdf85e846ca4eaf0f3be30
author Dave Chinner <david@fromorbit.com> 1400540222 +1000
committer Dave Chinner <david@fromorbit.com> 1400540222 +1000

Merge branch 'xfs-feature-bit-cleanup' into for-next

Conflicts:
	fs/xfs/xfs_inode.c