diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:04:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-10-20 18:04:08 +1100 |
| commit | 7b9642b14b6ee67c52df08bb4d83c814c5382ab1 (patch) | |
| tree | afdc4f834210b7043597b2ab246c4d03886baf2e /fs | |
| parent | 1a9f34a47333c3d16b1c93e98b5978a526ce5fa8 (diff) | |
| parent | 0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 (diff) | |
Merge commit 'trivial/next'
Conflicts:
Documentation/edac.txt
include/linux/securebits.h
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/fs.c | 2 | ||||
| -rw-r--r-- | fs/ntfs/aops.c | 2 | ||||
| -rw-r--r-- | fs/proc/nommu.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c index 249305d65d5b..a598de93bf1c 100644 --- a/fs/jffs2/fs.c +++ b/fs/jffs2/fs.c @@ -386,7 +386,7 @@ int jffs2_remount_fs (struct super_block *sb, int *flags, char *data) /* We stop if it was running, then restart if it needs to. This also catches the case where it was stopped and this is just a remount to restart it. - Flush the writebuffer, if neccecary, else we loose it */ + Flush the writebuffer, if necessary, else we lose it */ if (!(sb->s_flags & MS_RDONLY)) { jffs2_stop_garbage_collect_thread(c); mutex_lock(&c->alloc_sem); diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c index b38f944f0667..dc8aee904344 100644 --- a/fs/ntfs/aops.c +++ b/fs/ntfs/aops.c @@ -1298,7 +1298,7 @@ done: if (unlikely(err && err != -ENOMEM)) { /* * Set page error if there is only one ntfs record in the page. - * Otherwise we would loose per-record granularity. + * Otherwise we would lose per-record granularity. */ if (ni->itype.index.block_size == PAGE_CACHE_SIZE) SetPageError(page); diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c index 3f87d2632947..2c871f26c931 100644 --- a/fs/proc/nommu.c +++ b/fs/proc/nommu.c @@ -76,7 +76,7 @@ int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) /* * display a list of all the VMAs the kernel knows about - * - nommu kernals have a single flat list + * - nommu kernels have a single flat list */ static int nommu_vma_list_show(struct seq_file *m, void *v) { |