ok
Merge branch 'master' of github.com:chudaozhe/linux
Add *~ to .gitignore