Merge branch 'for_linus' into for_next

author Jan Kara <jack@suse.cz>

Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)

committer Jan Kara <jack@suse.cz>

Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
author Jan Kara <jack@suse.cz>
Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
committer Jan Kara <jack@suse.cz>
Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
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
author	Jan Kara <jack@suse.cz>
	Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
committer	Jan Kara <jack@suse.cz>
	Fri, 30 Jan 2015 09:16:33 +0000 (10:16 +0100)
		1	2
fs/quota/dquot.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_qm_syscalls.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_quotaops.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/quota.h	patch \|	diff1 \|	diff2 \|	blob \| history