| commit | a5344a9555fffd045218aced89afd6ca0f884e10 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 13 08:30:33 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Oct 13 08:30:33 2006 -0700 |
| tree | 85fcb093a18fe6858dffa66b733a99a30f117926 | |
| parent | 411fdc1a711665cb4bd13df2a75213153d463375 [diff] | |
| parent | 370298e2e6f513bc4a9e9445eeed060d8c31f1ca [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] Update git tree name/location [DLM] fix iovec length in recvmsg [GFS2] Pass the correct value to kunmap_atomic [GFS2] Fix bug where lock not held [DLM] Kconfig: don't show an empty DLM menu [GFS2] Fix uninitialised variable [GFS2] Fix a size calculation error