| commit | 8cea4eb642890a1de58980e7e1617d1765ef8f7c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 13 Mar 2010 22:38:53 +0000 (13 14:38 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 13 Mar 2010 22:38:53 +0000 (13 14:38 -0800) | ||
| tree | ea43bc34715d854c599743bf226437339bed1beb | treesnapshot (tar.gz zip) |
| parent | 122ce878dc189860a380539bde19498bf93443a7 | commitdiff |
| parent | 720e7749279bde0d08684b1bb4e7a2eedeec6394 | commitdiff |
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: Skip check for mandatory locks when unlocking
GFS2: Allow the number of committed revokes to temporarily be negative
GFS2: do not select QUOTA
* 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