Subject: linux-next: manual merge of the ubifs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 24 Jul 2008 15:22:05 +1000

Hi Artem,

Today's linux-next merge of the ubifs tree got conflicts in
Documentation/filesystems/ubifs.txt, fs/ubifs/budget.c,
fs/ubifs/commit.c, fs/ubifs/debug.c, fs/ubifs/dir.c, fs/ubifs/file.c,
fs/ubifs/io.c, fs/ubifs/journal.c, fs/ubifs/log.c, fs/ubifs/misc.h,
fs/ubifs/orphan.c, fs/ubifs/super.c and fs/ubifs/ubifs.h against Linus'
tree.

This has happened because of a partial merge of this tree into Linus'
tree.  I just took the ubifs tree's version of all those files.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/