init
Merge branch 'master' of github.com:taocp/linux-conf
init