del
Merge branch 'master' of github.com:wangjild/OS_Hacking

Conflicts:
	include/sys/protect.h
	include/sys/type.h
merge
Merge branch 'master' of github.com:wangjild/OS_Hacking

Conflicts:
	tools/Makefile