h files
Merge branch 'master' of https://github.com/chenminglei/final_fight

Conflicts:
	kernel/include/constant.h