| commit | b06ae1ead2915860bb49331e0588aab326801f71 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 20 16:29:04 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 20 16:29:04 2011 -0800 |
| tree | 4c4861d2212261223915e80d90f10da1c89e2f72 | |
| parent | e589501cb928b482c3c399444f788e1af35deee2 [diff] | |
| parent | 24d9765fc18c7838ccdbb0d71fb706321d9b824c [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: Fix error path in gfs2_lookup_by_inum() GFS2: remove iopen glocks from cache on failed deletes