OSDN Git Service

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)
commit465e2def7cb45864da1f82afb973a6acd1046ed8
treed085a45f4575a8ea31d128626c4f1f650cf9d54a
parent6bcf0939ff12464c7ea24c056826b8a26def9b06
parent074e427ba7f7398427e4f8e2aec071edcc509673
Merge branch 'xfs-sb-logging-rework' into for-next

Conflicts:
fs/xfs/xfs_mount.c
fs/xfs/libxfs/xfs_format.h
fs/xfs/xfs_log.c
fs/xfs/xfs_super.c