Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index c77514bd577..c5e82ece7c6 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1,7 +1,7 @@
 /*
 ** Write ahead logging implementation copyright Chris Mason 2000
 **
-** The background commits make this code very interelated, and
+** The background commits make this code very interrelated, and
 ** overly complex.  I need to rethink things a bit....The major players:
 **
 ** journal_begin -- call with the number of blocks you expect to log.
@@ -2725,7 +2725,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
                                                  REISERFS_DISK_OFFSET_IN_BYTES /
                                                  sb->s_blocksize + 2);
 
-        /* Sanity check to see is the standard journal fitting withing first bitmap
+        /* Sanity check to see is the standard journal fitting within first bitmap
            (actual for small blocksizes) */
         if (!SB_ONDISK_JOURNAL_DEVICE(sb) &&
             (SB_JOURNAL_1st_RESERVED_BLOCK(sb) +