| commit | 1ca7318cacdac5262492149cf46abc06c95693fa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 14 13:04:53 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Nov 14 13:04:53 2010 -0800 |
| tree | c8532b1cd52ab4858a7550b8e2dd0cb1f5a1eb03 | |
| parent | 0143832cc96d0bf78486297aad5c8fb2c2ead02a [diff] | |
| parent | 1c66b360fe26204e2aa14e45086b4a6b8890b1a2 [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: Change some lock status member in ocfs2_lock_res to char.