Merge branch 'updates' into lab2
Merge branch 'gdb-make' into lab2
	new file:   tags
	modified:   kern/env.c
	modified:   kern/pmap.c
	deleted:    kern/pmap.c~
Merge branch 'lab2' into lab3
	modified:   kern/env.c
	modified:   kern/pmap.c