Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes