| commit | 1bfe4eefe530f97c1625982d754908f33acf308d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 29 14:10:22 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Nov 29 14:10:22 2010 -0800 |
| tree | 53e1692220dd88309dfd564f6f5b06ec29650669 | |
| parent | 72083646528d4887b920deb71b37e09bc7d227bb [diff] | |
| parent | 14870b457524e745f1a118e17873d104b1a47b70 [diff] |
Merge git://git.kernel.org/pub/scm/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