update
Merge branch 'master' of github.com:chendong2012/configs

Conflicts:
	kernel_debug/notes
	shell/notes
	temp/hwmsen_dev.dia