]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a4ad58 e6b3bb7)
Merge branch 'xfs-4.7-error-cfg' into for-next
authorDave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
committerDave Chinner <david@fromorbit.com>
Fri, 20 May 2016 00:33:38 +0000 (10:33 +1000)
1  2 
fs/xfs/xfs_mount.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_trace.h patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/xfs_mount.c
Simple merge
diff --cc fs/xfs/xfs_trace.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.