Merging in 2.0.2.

2017-01-09 22:37:50 -05:00
parent a0406ec181
commit 50cf3276e7
118 changed files with 1350 additions and 3158 deletions
--- a/userland/testbin/dirconc/dirconc.c
+++ b/userland/testbin/dirconc/dirconc.c
@@ -84,7 +84,7 @@ choose_name(char *buf, size_t len)

 /*
 * The purpose of this is to be atomic. In our world, straight
- * tprintf tends not to be.
+ * printf tends not to be.
 */
 static
 void