| commit | 8cea4eb642890a1de58980e7e1617d1765ef8f7c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 13 14:38:53 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 13 14:38:53 2010 -0800 |
| tree | ea43bc34715d854c599743bf226437339bed1beb | |
| parent | 122ce878dc189860a380539bde19498bf93443a7 [diff] | |
| parent | 720e7749279bde0d08684b1bb4e7a2eedeec6394 [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: Skip check for mandatory locks when unlocking GFS2: Allow the number of committed revokes to temporarily be negative GFS2: do not select QUOTA