From: Linus Torvalds Date: Mon, 29 Nov 2010 22:10:22 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1bfe4eefe530f97c1625982d754908f33acf308d;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Userland expects quota limit/warn/usage in 512b blocks --- 1bfe4eefe530f97c1625982d754908f33acf308d