Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next
authorDave Chinner <david@fromorbit.com>
Mon, 9 Feb 2015 22:24:25 +0000 (09:24 +1100)
committerDave Chinner <david@fromorbit.com>
Mon, 9 Feb 2015 22:24:25 +0000 (09:24 +1100)
1  2 
Documentation/filesystems/xfs.txt
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_super.c

Simple merge
Simple merge
Simple merge