OSDN Git Service

Merge branch 'xfs-attr-cleanup' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 14 May 2014 23:39:28 +0000 (09:39 +1000)
commit2d6dcc6d7e95cc83046b2f97e179e6bbb7921245
treed2fd8f88141001a92c8aeb66706f2b502542ade6
parentff14ee42a038cf48263ac8d2eca5d30196554b82
parent6c888af0b4ca66565b2aa73147ebc1d139c3bd1b
Merge branch 'xfs-attr-cleanup' into for-next

Conflicts:
fs/xfs/xfs_attr.c
fs/xfs/xfs_attr.c