projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bcf093 074e427)
Merge branch 'xfs-sb-logging-rework' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 21 Jan 2015 22:20:53 +0000 (09:20 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 21 Jan 2015 22:20:53 +0000 (09:20 +1100)
Conflicts:
fs/xfs/xfs_mount.c

1  2 
fs/xfs/libxfs/xfs_format.h patch | diff1 | diff2 | blob | history
fs/xfs/xfs_log.c patch | diff1 | diff2 | blob | history
fs/xfs/xfs_super.c patch | diff1 | diff2 | blob | history

diff --cc fs/xfs/libxfs/xfs_format.h
Simple merge
diff --cc fs/xfs/xfs_log.c
Simple merge
diff --cc fs/xfs/xfs_super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.