Revert "Merging in 1.0.2."

This reverts commit 50cf3276e7.
2017-01-09 22:52:13 -05:00
parent 50cf3276e7
commit e318e3171e
118 changed files with 3158 additions and 1350 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
- * printf tends not to be.
+ * tprintf tends not to be.
 */
 static
 void