Merge branch 'for_linus' into for_next

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

diff --cc fs/xfs/xfs_qm_syscalls.c
Simple merge

diff --cc fs/xfs/xfs_quotaops.c
Simple merge

diff --cc include/linux/quota.h
Simple merge