final
Merge branch 'master' into gs

Conflicts:
	kernel/device.c
	kernel/device.c~
	kernel/sched/ub_test.c
	kernel/sched/ub_test.c~
	kernel/syscall/proc.c