proc.c
Merge branch 'master' of https://github.com/chenminglei/final_fight

Conflicts:
	kernel/syscall/proc.c