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/faulter/faulter.c
+++ b/userland/testbin/faulter/faulter.c
@@ -45,12 +45,12 @@ main(void)
 {
 	volatile int i;

-	tprintf("\nEntering the faulter program - I should die immediately\n");
+	printf("\nEntering the faulter program - I should die immediately\n");
 	i = *(int *)REALLY_BIG_ADDRESS;

 	// gcc 4.8 improperly demands this
 	(void)i;

-	tprintf("I didn't get killed!  Program has a bug\n");
+	printf("I didn't get killed!  Program has a bug\n");
 	return 0;
 }