hack

Conflicts:
	core/sched.cc
	drivers/virtio-net.cc