Merge branch 'quota_interface' into for_next_testing

author Jan Kara <jack@suse.cz>

Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)

committer Jan Kara <jack@suse.cz>

Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)
author Jan Kara <jack@suse.cz>
Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)
committer Jan Kara <jack@suse.cz>
Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)
diff --cc fs/quota/dquot.c
Simple merge
diff --cc include/linux/quota.h
Simple merge
diff --cc include/linux/quotaops.h
Simple merge
author	Jan Kara <jack@suse.cz>
	Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)
committer	Jan Kara <jack@suse.cz>
	Mon, 16 Mar 2015 09:26:41 +0000 (10:26 +0100)
		1	2
fs/quota/dquot.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/quota.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/quotaops.h	patch \|	diff1 \|	diff2 \|	blob \| history