summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2017-10-15 23:20:53 -0400
committerTheodore Ts'o <tytso@mit.edu>2017-10-15 23:20:53 -0400
commit69ab815dbe7981902847dfefd4f4c2d2cc855ef3 (patch)
treea118102004c8727be6a62ad08594216f3a85f01d /contrib
parenteec6f838ab03789659a05ac74aa0ba1b68de3be6 (diff)
parent852dae6f602084e30e305143e61da35ac224338f (diff)
downloade2fsprogs-69ab815dbe7981902847dfefd4f4c2d2cc855ef3.tar.gz
Merge branch 'maint' into next
Diffstat (limited to 'contrib')
-rw-r--r--contrib/add_ext4_encrypt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/add_ext4_encrypt.c b/contrib/add_ext4_encrypt.c
index d4e7c8c5..133fe253 100644
--- a/contrib/add_ext4_encrypt.c
+++ b/contrib/add_ext4_encrypt.c
@@ -1,5 +1,5 @@
/*
- * Basic progam to add ext4 encryption to a file system
+ * Basic program to add ext4 encryption to a file system
*
* Copyright 2015, Google, Inc.
*