diff options
author | 2016-05-26 12:49:21 -0700 | |
---|---|---|
committer | 2016-05-26 12:49:21 -0700 | |
commit | 9257b4ca9dff074918164e4fa10e9001c62bc27a (patch) | |
tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/extent_map.c | |
parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7 (diff) | |
parent | Merge branch 'dev/comp-workspaces' into for-chris-4.7-20160525 (diff) | |
download | wireguard-linux-9257b4ca9dff074918164e4fa10e9001c62bc27a.tar.xz wireguard-linux-9257b4ca9dff074918164e4fa10e9001c62bc27a.zip |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
Diffstat (limited to 'fs/btrfs/extent_map.c')
-rw-r--r-- | fs/btrfs/extent_map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 318b048eb254..e0715fcfb11e 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -62,7 +62,7 @@ struct extent_map *alloc_extent_map(void) /** * free_extent_map - drop reference count of an extent_map - * @em: extent map being releasead + * @em: extent map being released * * Drops the reference out on @em by one and free the structure * if the reference count hits zero. |