Merge branch 'nogs'

author Frans Kaashoek <kaashoek@mit.edu>

Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)

committer Frans Kaashoek <kaashoek@mit.edu>

Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)
author Frans Kaashoek <kaashoek@mit.edu>
Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)
committer Frans Kaashoek <kaashoek@mit.edu>
Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)
diff --cc fs.c
Simple merge
diff --cc vm.c
Simple merge
author	Frans Kaashoek <kaashoek@mit.edu>
	Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)
committer	Frans Kaashoek <kaashoek@mit.edu>
	Mon, 7 Aug 2017 18:35:05 +0000 (14:35 -0400)
		1	2
fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
vm.c	patch \|	diff1 \|	diff2 \|	blob \| history