summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:41:09 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 08:41:09 -0800
commit1e8c573933fd7975679766850252ad08667e5ca4 (patch)
tree9600d0c7ee5ea8925f3c4dc30680c819e0363805 /mm
parentd71eecf3b8e893757cc3dec560c96a32ac090890 (diff)
parent232443e2c90cc2930624dec89df327615b002c55 (diff)
downloadlinux-3.10-1e8c573933fd7975679766850252ad08667e5ca4.tar.gz
linux-3.10-1e8c573933fd7975679766850252ad08667e5ca4.tar.bz2
linux-3.10-1e8c573933fd7975679766850252ad08667e5ca4.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits) BUG_ON() Conversion in drivers/video/ BUG_ON() Conversion in drivers/parisc/ BUG_ON() Conversion in drivers/block/ BUG_ON() Conversion in sound/sparc/cs4231.c BUG_ON() Conversion in drivers/s390/block/dasd.c BUG_ON() Conversion in lib/swiotlb.c BUG_ON() Conversion in kernel/cpu.c BUG_ON() Conversion in ipc/msg.c BUG_ON() Conversion in block/elevator.c BUG_ON() Conversion in fs/coda/ BUG_ON() Conversion in fs/binfmt_elf_fdpic.c BUG_ON() Conversion in input/serio/hil_mlc.c BUG_ON() Conversion in md/dm-hw-handler.c BUG_ON() Conversion in md/bitmap.c The comment describing how MS_ASYNC works in msync.c is confusing rcu: undeclared variable used in documentation fix typos "wich" -> "which" typo patch for fs/ufs/super.c Fix simple typos tabify drivers/char/Makefile ...
Diffstat (limited to 'mm')
-rw-r--r--mm/msync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/msync.c b/mm/msync.c
index 2672b8dc3d8..bc6c9537636 100644
--- a/mm/msync.c
+++ b/mm/msync.c
@@ -126,7 +126,7 @@ static unsigned long msync_page_range(struct vm_area_struct *vma,
* write out the dirty pages and wait on the writeout and check the result.
* Or the application may run fadvise(FADV_DONTNEED) against the fd to start
* async writeout immediately.
- * So my _not_ starting I/O in MS_ASYNC we provide complete flexibility to
+ * So by _not_ starting I/O in MS_ASYNC we provide complete flexibility to
* applications.
*/
static int msync_interval(struct vm_area_struct *vma, unsigned long addr,