summaryrefslogtreecommitdiffstats
path: root/fs/xfs/uuid.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-06-04 13:55:48 +1000
committerDave Chinner <david@fromorbit.com>2015-06-04 13:55:48 +1000
commit4ea79766168b64766d6c9fcdaa9fab83a6cfebcf (patch)
tree7b29eaf46119a920f277b5cd13c818e2d35beafa /fs/xfs/uuid.c
parent4497f28750cd129a669e32b7810dd755102aebbd (diff)
parentf78c3901074e113a04150230087f1d76033bb0a4 (diff)
downloadop-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.zip
op-kernel-dev-4ea79766168b64766d6c9fcdaa9fab83a6cfebcf.tar.gz
Merge branch 'xfs-commit-cleanup' into for-next
Conflicts: fs/xfs/xfs_attr_inactive.c
Diffstat (limited to 'fs/xfs/uuid.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud