]> git.karo-electronics.de Git - linux-beck.git/commitdiff
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
fs/xfs/xfs_log.c
fs/xfs/xfs_super.c

Simple merge
Simple merge
Simple merge