Merge remote-tracking branch 'gfs2/master'

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc fs/gfs2/ops_fstype.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc fs/gfs2/super.c
Simple merge

diff --cc fs/gfs2/sys.c
Simple merge