summaryrefslogtreecommitdiff
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-05 12:08:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-05 12:08:47 -0700
commit2dd1cb5a7ea7aa0d3f7f36baa48aae3725655647 (patch)
tree827eb1daa5055d56762709848b9a2ddf617b7884 /fs/ocfs2
parent74b9272bbedf45cb01a048217830d64d59aaa73b (diff)
parentbeadadfa5467e09e36891f39cae1f5d8d3bbf17e (diff)
Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs
Pull ubifs fix from Artem Bityutskiy: "Only a single patch which fixes a message" * tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs: UBIFS: correct mount message
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions