author | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800) |
* '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.
ocfs2: Change some lock status member in ocfs2_lock_res to char.
Trivial merge