Merge branch 'master' of http://github.com/kmalloc/back-end-facility

Conflicts:
	sys/log.h
	sys/src/log.cc
Merge branch 'master' of http://github.com/kmalloc/back-end-facility