Merge branch 'cleanups-4.7' into for-chris-4.7-20160525

2016-05-25 22:51:03 +02:00
parent e73440868f 0132761017
commit 42f31734eb
36 changed files with 193 additions and 196 deletions
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -313,7 +313,7 @@ struct btrfs_dio_private {
 	struct bio *dio_bio;

 	/*
-	 * The original bio may be splited to several sub-bios, this is
+	 * The original bio may be split to several sub-bios, this is
 	 * done during endio of sub-bios
 	 */
 	int (*subio_endio)(struct inode *, struct btrfs_io_bio *, int);