Merge branch 'board' of git://github.com/hzhuang1/linux into next/cleanup