| commit | 2584e7986f235572d4b03bbe52fd1e85c1679b8e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 24 14:41:28 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 24 14:41:28 2009 -0700 |
| tree | 7265bf25f3e6ab4b8f0a7e2e5d0500aa1de77b55 | |
| parent | 7c0a57d5c47bcfc492b3139e77400f888a935c44 [diff] | |
| parent | c795b33ba171e41563ab7e25105c0cd4edd81cd7 [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2/dlm: Wait on lockres instead of erroring cancel requests ocfs2: Add missing lock name ocfs2: Don't oops in ocfs2_kill_sb on a failed mount ocfs2: release the buffer head in ocfs2_do_truncate. ocfs2: Handle quota file corruption more gracefully