From: Linus Torvalds Date: Mon, 26 Jan 2009 18:41:00 +0000 (-0800) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... X-Git-Tag: v3.0~10814 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc597bc3d31468596af6b8ad2b1d1b593e308957;p=platform%2Fkernel%2Flinux-amlogic.git Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-quota-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6: ocfs2: Remove ocfs2_dquot_initialize() and ocfs2_dquot_drop() quota: Improve locking --- cc597bc3d31468596af6b8ad2b1d1b593e308957