aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-14 13:04:53 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-14 13:04:53 -0800
commit1ca7318cacdac5262492149cf46abc06c95693fa (patch)
treec8532b1cd52ab4858a7550b8e2dd0cb1f5a1eb03 /mm
parent0143832cc96d0bf78486297aad5c8fb2c2ead02a (diff)
parent1c66b360fe26204e2aa14e45086b4a6b8890b1a2 (diff)
downloadmrst-s0i3-test-1ca7318cacdac5262492149cf46abc06c95693fa.tar.gz
mrst-s0i3-test-1ca7318cacdac5262492149cf46abc06c95693fa.tar.xz
mrst-s0i3-test-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 'mm')
0 files changed, 0 insertions, 0 deletions