OSDN Git Service

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)
commitb70f14e1ffbb47369b1cc2cdf558c3468ae9e484
treecccbdd2422a7338a8185eb83493ffac3bb4ddaa9
parent0d907a3bb4a77cffebebd17c323e898048301aa3
parentab3e57b53f549ad51cbdf85e846ca4eaf0f3be30
Merge branch 'xfs-feature-bit-cleanup' into for-next

Conflicts:
fs/xfs/xfs_inode.c
fs/xfs/xfs_dir2.c
fs/xfs/xfs_fsops.c
fs/xfs/xfs_ialloc.c
fs/xfs/xfs_inode.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_sb.h