Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:10:22 +0000 (14:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Nov 2010 22:10:22 +0000 (14:10 -0800)
commit1bfe4eefe530f97c1625982d754908f33acf308d
tree53e1692220dd88309dfd564f6f5b06ec29650669
parent72083646528d4887b920deb71b37e09bc7d227bb
parent14870b457524e745f1a118e17873d104b1a47b70
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