make a big tree
Merge branch 'master' of github.com:WangHuaJie/linux_whj

Conflicts: