diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-14 13:04:53 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-14 13:04:53 -0800 |
commit | 1ca7318cacdac5262492149cf46abc06c95693fa (patch) | |
tree | c8532b1cd52ab4858a7550b8e2dd0cb1f5a1eb03 /fs/sync.c | |
parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 (diff) | |
parent | ocfs2: Change some lock status member in ocfs2_lock_res to char. (diff) | |
download | linux-dev-1ca7318cacdac5262492149cf46abc06c95693fa.tar.xz linux-dev-1ca7318cacdac5262492149cf46abc06c95693fa.zip |
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.
Diffstat (limited to 'fs/sync.c')
0 files changed, 0 insertions, 0 deletions